diff --git a/defaults.xml b/defaults.xml
index acdfcdeff..171a29713 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -732,6 +732,7 @@ Started September 2000 by David Megginson, david@megginson.com
       <drag-sensitivity type="double" userarchive="y">1.0</drag-sensitivity>
       <invert-mouse-wheel type="bool" userarchive="y">false</invert-mouse-wheel>
       <skip-flight-controls-mode type="bool" userarchive="y">false</skip-flight-controls-mode>
+      <mouse-rudder-elevator type="bool" userarchive="y">false</mouse-rudder-elevator>
     </mouse>
     <replay>
       <duration type="double" userarchive="y">90</duration>
diff --git a/gui/dialogs/input-config.xml b/gui/dialogs/input-config.xml
index d35892afd..4903100b7 100644
--- a/gui/dialogs/input-config.xml
+++ b/gui/dialogs/input-config.xml
@@ -209,6 +209,35 @@
       <col>1</col>
     </checkbox>
 
+  <!-- end group 5 -->
+  </group>
+
+  <!-- start group 6 -->
+  <group>
+
+    <halign>left</halign>
+    <valign>top</valign>
+    <layout>table</layout>
+
+    <!-- gap to left border -->
+    <text>
+        <halign>left</halign>
+        <label>   </label>
+        <row>0</row>
+        <col>0</col>
+    </text>
+
+    <checkbox>
+      <halign>left</halign>
+      <label> Mouse rudder also controls elevator</label>
+      <property>/sim/mouse/mouse-rudder-elevator</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+      <row>0</row>
+      <col>1</col>
+    </checkbox>
+
     <!-- empty line before next -->
     <text>
       <row>1</row>
@@ -217,7 +246,7 @@
       <halign>left</halign>
     </text>
 
-  <!-- end group 5 -->
+  <!-- end group 6 -->
   </group>
 
   <hrule/>
diff --git a/mice.xml b/mice.xml
index b1845170c..9594a75ed 100644
--- a/mice.xml
+++ b/mice.xml
@@ -151,19 +151,17 @@ current mode for each mouse is held in the
     <!-- No buttons pressed: control elevator -->
     <binding>
      <condition>
-      <!--
       <and>
-       <not>
-        <property>/devices/status/mice/mouse[0]/button[0]</property>
-       </not>
+       <or>
+        <not>
+         <property>/devices/status/mice/mouse[0]/button[0]</property>
+        </not>
+        <property>/sim/mouse/mouse-rudder-elevator</property>
+       </or>
        <not>
         <property>/devices/status/mice/mouse[0]/button[1]</property>
        </not>
       </and>
-      -->
-      <not>
-        <property>/devices/status/mice/mouse[0]/button[1]</property>
-      </not>
      </condition>
      <command>property-adjust</command>
      <property>/controls/flight/elevator</property>