1 files changed, 15 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 74c7a1f15..f273f3209 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -14,6 +14,7 @@ namespace HandBrakeWPF.ViewModels
     using System.ComponentModel;
     using System.Globalization;
     using System.Linq;
+    using System.Windows;
 
     using Caliburn.Micro;
 
@@ -27,7 +28,6 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.Interop.Model.Encoding.x264;
 
     using HandBrakeWPF.Commands.Interfaces;
-    using HandBrakeWPF.Model;
     using HandBrakeWPF.Properties;
     using HandBrakeWPF.ViewModels.Interfaces;
 
@@ -173,6 +173,12 @@ namespace HandBrakeWPF.ViewModels
             {
                 if (!object.Equals(value, this.useAdvancedTab))
                 {
+                    // Set the Advanced Tab up with the current settings, if we can.
+                    if (value && !this.userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibHbFeatures))
+                    {
+                        this.Task.AdvancedEncoderOptions = this.GetActualx264Query();
+                    }
+
                     this.useAdvancedTab = value;
                     this.Task.ShowAdvancedTab = value;
                     this.NotifyOfPropertyChange(() => this.UseAdvancedTab);
@@ -873,6 +879,14 @@ namespace HandBrakeWPF.ViewModels
             this.canClear = true;
         }
 
+        /// <summary>
+        /// The copy query.
+        /// </summary>
+        public void CopyQuery()
+        {
+            Clipboard.SetDataObject(this.SelectedVideoEncoder == VideoEncoder.X264 ? this.GetActualx264Query() : this.ExtraArguments);
+        }
+
         #endregion
 
         /// <summary>