diff --git a/keyboard.xml b/keyboard.xml
index 7617e8399..dc6698cb8 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -660,10 +660,16 @@ calculated by adding 256 to the GLUT key value in glut.h.
    <command>nasal</command>
    <script>
     if(getprop("/sim/allow-toggle-cockpit")) {
-        setprop("/sim/current-view/heading-offset-deg", 0);
-        setprop("/sim/current-view/pitch-offset-deg", 0);
-        setprop("/sim/view/internal", !getprop("/sim/view/internal"));
+        setprop("/sim/current-view/internal", !getprop("/sim/current-view/internal"));
+        setprop("/sim/view/internal", getprop("/sim/current-view/internal"));
         setprop("/sim/virtual-cockpit", !getprop("/sim/virtual-cockpit"));
+        if(getprop("/sim/current-view/internal")) {
+          setprop("/sim/current-view/heading-offset-deg", getprop("/sim/current-view/config/heading-offset-deg"));
+          setprop("/sim/current-view/pitch-offset-deg", getprop("/sim/current-view/config/pitch-offset-deg"));
+        } else {
+          setprop("/sim/current-view/heading-offset-deg", 0);
+          setprop("/sim/current-view/pitch-offset-deg", 0);
+        }
     }
    </script>
   </binding>
diff --git a/preferences.xml b/preferences.xml
index 663eb8ab1..4507a9932 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -94,6 +94,7 @@ Started September 2000 by David Megginson, david@megginson.com
 
   <number-views type="int">6</number-views>
   <chase-distance-m type="double">-25.0</chase-distance-m>
+  <allow-toggle-cockpit type="bool">false</allow-toggle-cockpit>
 
   <!-- "tower" positioned to right of runway at KSFO -->
   <tower>