diff --git a/defaults.xml b/defaults.xml
index 075847f4f..c46b02825 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -770,6 +770,22 @@ Started September 2000 by David Megginson, david@megginson.com
       <style n="1" include="gui/styles/anthrax.xml"/>
       <devel-widgets type="bool" userarchive="y">false</devel-widgets>
       <chat-box-location type="string" userarchive="y">default</chat-box-location>
+      <map userarchive="y">  <!-- ensure map options are saved -->
+        <draw-fixes type="bool" userarchive="y">false</draw-fixes>
+        <draw-navaids type="bool" userarchive="y">true</draw-navaids>
+        <draw-data type="bool" userarchive="y">false</draw-data>
+        <draw-heliports type="bool" userarchive="y">false</draw-heliports>
+        <draw-traffic type="bool" userarchive="y">false</draw-traffic>
+        <draw-flight-history type="bool" userarchive="y">false</draw-flight-history>
+
+        <magnetic-headings type="bool" userarchive="y">true</magnetic-headings>
+        <centre-on-aircraft type="bool" userarchive="y">true</centre-on-aircraft>
+        <aircraft-heading-up type="bool" userarchive="y">false</aircraft-heading-up>
+        <transparent type="bool" userarchive="y">false</transparent>
+        <key-pan type="bool" userarchive="y">false</key-pan>
+
+        <zoom userarchive="n" type="int">6</zoom> <!-- but not zoom, that could be confusing -->
+      </map>
     </gui>
     <mouse>
       <hide-cursor type="bool" userarchive="y">true</hide-cursor>
diff --git a/gui/dialogs/map.xml b/gui/dialogs/map.xml
index dba50b8c1..7c505ba65 100644
--- a/gui/dialogs/map.xml
+++ b/gui/dialogs/map.xml
@@ -25,7 +25,7 @@ command interface /autopilot/route-manager/input:
         <open>
             var mapDialog = cmdarg();
             var setTransparency = func(updateDialog){
-                var alpha = (getprop("/gui/map/transparent") or 0);
+                var alpha = (getprop("/sim/gui/map/transparent") or 0);
                 mapDialog.getNode("color/alpha").setValue(1-alpha*0.3);
                 # mhab commented out
                 #mapDialog.getNode("color/red").setValue(0.41-alpha*0.2);
@@ -87,7 +87,7 @@ command interface /autopilot/route-manager/input:
             <checkbox>
                 <label>Heliports</label>
                 <halign>left</halign>
-                <property>/gui/map/draw-heliports</property>
+                <property>/sim/gui/map/draw-heliports</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -100,7 +100,7 @@ command interface /autopilot/route-manager/input:
             <checkbox>
                 <label>Fixes</label>
                 <halign>left</halign>
-                <property>/gui/map/draw-fixes</property>
+                <property>/sim/gui/map/draw-fixes</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -113,7 +113,7 @@ command interface /autopilot/route-manager/input:
             <checkbox>
                 <label>Navaids</label>
                 <halign>left</halign>
-                <property>/gui/map/draw-navaids</property>
+                <property>/sim/gui/map/draw-navaids</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -132,7 +132,7 @@ command interface /autopilot/route-manager/input:
             <checkbox>
                 <label>Traffic</label>
                 <halign>left</halign>
-                <property>/gui/map/draw-traffic</property>
+                <property>/sim/gui/map/draw-traffic</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -152,7 +152,7 @@ command interface /autopilot/route-manager/input:
             <checkbox>
                 <label>Data</label>
                 <halign>left</halign>
-                <property>/gui/map/draw-data</property>
+                <property>/sim/gui/map/draw-data</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -165,7 +165,7 @@ command interface /autopilot/route-manager/input:
             <checkbox>
                 <label>Flight History</label>
                 <halign>left</halign>
-                <property>/gui/map/draw-flight-history</property>
+                <property>/sim/gui/map/draw-flight-history</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -183,7 +183,7 @@ command interface /autopilot/route-manager/input:
 <!--
                 <pref-width>100</pref-width>
 -->
-                <property>/gui/map/magnetic-headings</property>
+                <property>/sim/gui/map/magnetic-headings</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -196,7 +196,7 @@ command interface /autopilot/route-manager/input:
             <checkbox>
                 <label>Center on Acft</label>
                 <halign>left</halign>
-                <property>/gui/map/centre-on-aircraft</property>
+                <property>/sim/gui/map/centre-on-aircraft</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -209,7 +209,7 @@ command interface /autopilot/route-manager/input:
             <checkbox>
                 <label>Aircraft Hdg Up</label>
                 <halign>left</halign>
-                <property>/gui/map/aircraft-heading-up</property>
+                <property>/sim/gui/map/aircraft-heading-up</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -225,7 +225,7 @@ command interface /autopilot/route-manager/input:
 <!--
                 <pref-width>100</pref-width>
 -->
-                <property>/gui/map/transparent</property>
+                <property>/sim/gui/map/transparent</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -242,7 +242,7 @@ command interface /autopilot/route-manager/input:
             <checkbox>
                 <label>Pan with keys</label>
                 <halign>left</halign>
-                <property>/gui/map/key-pan</property>
+                <property>/sim/gui/map/key-pan</property>
                 <live>true</live>
                 <binding>
                   <command>dialog-apply</command>
@@ -278,7 +278,7 @@ command interface /autopilot/route-manager/input:
                 <stretch>true</stretch>
                 <pref-height>400</pref-height>
                 <pref-width>600</pref-width>
-                <property>/gui/map</property>
+                <property>/sim/gui/map</property>
             </map>
 
             <hrule/>
@@ -294,7 +294,7 @@ command interface /autopilot/route-manager/input:
 
                     <binding>
                         <command>property-adjust</command>
-                        <property>/gui/map/zoom</property>
+                        <property>/sim/gui/map/zoom</property>
                         <min>0</min>
                         <step>-1</step>
                     </binding>
@@ -303,7 +303,7 @@ command interface /autopilot/route-manager/input:
                 <text>
                     <label>MMM</label>
                     <format>Zoom %d</format>
-                    <property>/gui/map/zoom</property>
+                    <property>/sim/gui/map/zoom</property>
                     <live>true</live>
                 </text>
 
@@ -315,7 +315,7 @@ command interface /autopilot/route-manager/input:
 
                     <binding>
                         <command>property-adjust</command>
-                        <property>/gui/map/zoom</property>
+                        <property>/sim/gui/map/zoom</property>
                         <step>1</step>
                         <max>12</max>
                     </binding>