diff --git a/Nasal/view.nas b/Nasal/view.nas
index 3a3628f66..c8209f080 100644
--- a/Nasal/view.nas
+++ b/Nasal/view.nas
@@ -34,10 +34,18 @@ var views = nil;    # list of all view branches (/sim/view[n]) as props.Node
 var current = nil;  # current view branch (e.g. /sim/view[1]) as props.Node
 var fovProp = nil;
 
+var setView = func(n) {
+    setprop("/sim/current-view/view-number", n);
+    
+    # We install a listener for /sim/current-view/view-number which also sets
+    # /sim/current-view/view-number-raw, but set it here anyway, just in case.
+    setprop("/sim/current-view/view-number-raw", views[n].getIndex());
+}
+
 # activate view by index number used in XML definition (e.g. >100)
 var setViewByIndex = func(i) {
     if (indices[i] != nil)
-        setprop("/sim/current-view/view-number", indices[i]);
+        setView(indices[i]);
 }
 
 var hasmember = func(class, member) {
@@ -135,7 +143,7 @@ var stepView = func(step, force = 0) {
             (views[n].getNode("name")!=nil))
             break;
     }
-    setprop("/sim/current-view/view-number", n);
+    setView(n);
 
     # And pop up a nice reminder
     var popup=getprop("/sim/view-name-popup");
@@ -318,6 +326,10 @@ var manager = {
                     model_view_handler.start();
                 }
 		screenWidthCompens.update();
+                
+                # Make sure /sim/current-view/view-number-raw is kept up to
+                # date.
+                setprop("/sim/current-view/view-number-raw", views[which].getIndex());
 	},
 	reset : func {
 		if (hasmember(me.current.handler, "reset"))
@@ -455,10 +467,21 @@ var model_view_handler_class = {
         m.dialog = props.Node.new({ "dialog-name": "model-view" });
         m.listener = setlistener("/sim/signals/multiplayer-updated", func m._update_(), 1);
         m.reset();
+        _setlistener("/sim/menubar/legacy-multiplayer-view-selector/enabled", func {
+                var enabled = getprop("/sim/menubar/legacy-multiplayer-view-selector/enabled");
+                if (enabled) {
+                    m.start();
+                }
+                else {
+                    m.stop();
+                }
+                });
         return m;
     },
     start: func() {
-        fgcommand("dialog-show", me.dialog);
+        if (getprop('/sim/menubar/legacy-multiplayer-view-selector/enabled')) {
+            fgcommand("dialog-show", me.dialog);
+        }
         me.next(0);
     },
     stop: func() {
@@ -581,7 +604,7 @@ var pilot_view_limiter = {
 				offset = (me.right.threshold - hdg) * me.right.scale;
 
 			var new_offset = me.xoffset_lowpass.filter(offset);
-			me.xoffsetN.setDoubleValue(me.xoffsetN.getValue() - me.last_offset + new_offset);
+			me.xoffsetN.setDoubleValue((me.xoffsetN.getValue() or 0) - me.last_offset + new_offset);
 			me.last_offset = new_offset;
 		}
 		return 0;
@@ -712,7 +735,7 @@ var point = {
 		prop != nil or return;
 		var n = prop.getNode("view-number");
 		if (n != nil)
-			setprop("/sim/current-view/view-number",n.getValue());
+			setView(n.getValue());
 		foreach (var a; keys(me.axes)) {
 			var n = prop.getNode(a);
 			me.axes[a].reset();
diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml
index 77c42287b..69a89a7d8 100644
--- a/gui/dialogs/view.xml
+++ b/gui/dialogs/view.xml
@@ -257,6 +257,15 @@
           <label>sec.</label>
         </text>
       </group>
+     
+      <checkbox>
+        <halign>left</halign>
+        <label>Legacy multiplayer view selector</label>
+        <property>/sim/menubar/legacy-multiplayer-view-selector/enabled</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </checkbox>
       
     </group>