diff --git a/Translations/default/menu.xml b/Translations/default/menu.xml
index 511d853a0..ef18e9e79 100644
--- a/Translations/default/menu.xml
+++ b/Translations/default/menu.xml
@@ -67,6 +67,7 @@
 	<radio>Radio Settings</radio>
 	<gps>GPS Settings</gps>
 	<instrument-settings>Instrument Settings</instrument-settings>
+	<light-switches>Light switches</light-switches>
 	<failure-submenu>--- Failures ---</failure-submenu>
 	<random-failures>Random Failures</random-failures>
 	<system-failures>System Failures</system-failures>
diff --git a/gui/dialogs/light-switches.xml b/gui/dialogs/light-switches.xml
new file mode 100644
index 000000000..1d0821ca3
--- /dev/null
+++ b/gui/dialogs/light-switches.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0"?>
+<PropertyList>
+  <name>light-switches</name>
+  <layout>vbox</layout>
+  <resizable>true</resizable>
+  <prefered-width>200</prefered-width>
+  <!-- title bar -->
+  <group>
+    <layout>hbox</layout>
+    <empty>
+      <stretch>1</stretch>
+    </empty>
+    <text>
+      <label>Default light switches</label>
+    </text>
+    <empty>
+      <stretch>1</stretch>
+    </empty>
+    <button>
+      <legend>X</legend>
+      <key>Esc</key>
+      <pref-width>20</pref-width>
+      <pref-height>20</pref-height>
+      <border>2</border>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+  </group>
+  <hrule/>
+  <checkbox>
+    <halign>left</halign>
+    <label>Beacon</label>
+    <property>/controls/lighting/beacon</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </checkbox>
+  <checkbox>
+    <halign>left</halign>
+    <label>Nav lights</label>
+    <property>/controls/lighting/nav-lights</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </checkbox>
+  <checkbox>
+    <halign>left</halign>
+    <label>Taxi light</label>
+    <property>/controls/lighting/taxi-light</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </checkbox>
+  <checkbox>
+    <halign>left</halign>
+    <label>Landing lights</label>
+    <property>/controls/lighting/landing-lights</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </checkbox>
+  <checkbox>
+    <halign>left</halign>
+    <label>Strobe</label>
+    <property>/controls/lighting/strobe</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </checkbox>
+  <checkbox>
+    <halign>left</halign>
+    <label>Logo lights</label>
+    <property>/controls/lighting/logo-lights</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </checkbox>
+  <checkbox>
+    <halign>left</halign>
+    <label>Turn off lights</label>
+    <property>/controls/lighting/turn-off-lights</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </checkbox>
+  <checkbox>
+    <halign>left</halign>
+    <label>Formation lights</label>
+    <property>/controls/lighting/formation-lights</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </checkbox>
+  <slider>
+    <halign>left</halign>
+    <label>Panel</label>
+    <property>/controls/lighting/panel-norm</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </slider>
+  <slider>
+    <halign>left</halign>
+    <label>Instruments</label>
+    <property>/controls/lighting/instruments-norm</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </slider>
+  <slider>
+    <halign>left</halign>
+    <label>Dome</label>
+    <property>/controls/lighting/dome-norm</property>
+    <live type="bool">true</live>
+    <binding>
+      <command>dialog-apply</command>
+    </binding>
+  </slider>
+</PropertyList>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 7ca517523..9b3892b43 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -485,6 +485,13 @@
 				<command>dialog-show</command>
 				<dialog-name>instruments</dialog-name>
 			</binding>
+		</item>	
+		<item>
+			<name>light-switches</name>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>light-switches</dialog-name>
+			</binding>
 		</item>
 
 		<item>