diff --git a/Controls/GimbalControlSettingsForm.cs b/Controls/GimbalControlSettingsForm.cs
index 85419c8056..e80b431acb 100644
--- a/Controls/GimbalControlSettingsForm.cs
+++ b/Controls/GimbalControlSettingsForm.cs
@@ -317,8 +317,8 @@ public GimbalControlSettings()
             CameraVFOV = 30.0m; // vertical, degrees
 
             // Default boolean options
-            DefaultLockedMode = false;
             UseFOVReportedByCamera = true;
+            DefaultLockedMode = false;
         }
 
         public GimbalControlSettings(GimbalControlSettings other)
diff --git a/Controls/GimbalVideoControl.cs b/Controls/GimbalVideoControl.cs
index 34b983958f..ce27c20f13 100644
--- a/Controls/GimbalVideoControl.cs
+++ b/Controls/GimbalVideoControl.cs
@@ -101,6 +101,8 @@ public GimbalVideoControl()
 
             loadPreferences();
 
+            yaw_lock = preferences.DefaultLockedMode;
+
             // Register the global key handler
             Application.AddMessageFilter(this);