diff --git a/Nasal/controls.nas b/Nasal/controls.nas
index 5f0b01a4f..b4152389a 100644
--- a/Nasal/controls.nas
+++ b/Nasal/controls.nas
@@ -536,6 +536,10 @@ var cycleMouseMode = func(node)
     if (mode == 3) mode = 0;
     modeNode.setIntValue(mode);
     
+    # this is really a 'show on-screen hints' control
+    if (getprop('/sim/view-name-popup') == 0)
+      return;
+    
     if (mode == 1) {
         setprop("/sim/messages/copilot", "Mouse is controlling flight controls. Press TAB to change.");
     } elsif (mode == 2) {
diff --git a/gui/dialogs/interface-config.xml b/gui/dialogs/interface-config.xml
index 41f4e6f2b..0ef36d287 100644
--- a/gui/dialogs/interface-config.xml
+++ b/gui/dialogs/interface-config.xml
@@ -133,6 +133,22 @@
       </binding>
     </checkbox>
     
+    
+    <text>
+      <row>5</row>
+      <col>0</col>
+      <label>Disable mouse flight-controls mode</label>
+      <padding>10</padding>
+    </text>
+
+    <checkbox>
+      <row>5</row>
+      <col>1</col>
+      <property>/sim/mouse/skip-flight-controls-mode</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </checkbox>
   </group>
 
   <nasal>