diff --git a/gui/dialogs/load_flight.xml b/gui/dialogs/load_flight.xml
new file mode 100644
index 000000000..53d4c7fba
--- /dev/null
+++ b/gui/dialogs/load_flight.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+ <name>load_flight</name>
+ <layout>vbox</layout>
+
+ <group>
+   <layout>hbox</layout>
+
+   <text><label>File Name:</label></text>
+   <input>
+     <halign>fill</halign>
+     <stretch>true</stretch>
+     <property>/tmp/flight/file</property>
+   </input>
+ </group>
+
+ <group>
+   <layout>hbox</layout>
+   <empty><stretch>true</stretch></empty>
+   <button>
+     <legend>OK</legend>
+     <equal>true</equal>
+     <binding><command>dialog-apply</command></binding>
+     <binding>
+      <command>nasal</command>
+      <script>
+       fgcommand("load", props.globals.getNode("/tmp/flight") );
+      </script>
+     </binding>
+     <binding><command>dialog-close</command></binding>
+   </button>
+   <empty><stretch>true</stretch></empty>
+   <button>
+     <legend>Cancel</legend>
+     <equal>true</equal>
+     <binding><command>dialog-close</command></binding>
+   </button>
+   <empty><stretch>true</stretch></empty>
+ </group>
+</PropertyList>
diff --git a/gui/dialogs/save_flight.xml b/gui/dialogs/save_flight.xml
new file mode 100644
index 000000000..8cbf66eb4
--- /dev/null
+++ b/gui/dialogs/save_flight.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+ <name>save_flight</name>
+ <layout>vbox</layout>
+
+ <group>
+   <layout>hbox</layout>
+
+   <text><label>File Name:</label></text>
+   <input>
+     <halign>fill</halign>
+     <stretch>true</stretch>
+     <property>/tmp/flight/file</property>
+   </input>
+ </group>
+
+ <group>
+   <layout>hbox</layout>
+   <empty><stretch>true</stretch></empty>
+   <button>
+     <legend>OK</legend>
+     <equal>true</equal>
+     <binding><command>dialog-apply</command></binding>
+     <binding>
+      <command>nasal</command>
+      <script>
+       fgcommand("save", props.globals.getNode("/tmp/flight") );
+      </script>
+     </binding>
+     <binding><command>dialog-close</command></binding>
+   </button>
+   <empty><stretch>true</stretch></empty>
+   <button>
+     <legend>Cancel</legend>
+     <equal>true</equal>
+     <binding><command>dialog-close</command></binding>
+   </button>
+   <empty><stretch>true</stretch></empty>
+ </group>
+</PropertyList>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 1d5bebe25..7198a5c96 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -6,14 +6,16 @@
   <item>
    <label>Save</label>
    <binding>
-    <command>old-save-dialog</command>
+    <command>dialog-show</command>
+    <dialog-name>save_flight</dialog-name>
    </binding>
   </item>
 
   <item>
    <label>Load</label>
    <binding>
-    <command>old-load-dialog</command>
+    <command>dialog-show</command>
+    <dialog-name>load_flight</dialog-name>
    </binding>
   </item>