diff --git a/Nasal/view.nas b/Nasal/view.nas
index ee2b09bdd..3f65153df 100644
--- a/Nasal/view.nas
+++ b/Nasal/view.nas
@@ -376,8 +376,8 @@ var model_view_handler = {
 				return i;
 		return nil;
 	},
-	select: func(which) {
-		if (num(which) == nil)
+	select: func(which, by_callsign=0) {
+		if (by_callsign or num(which) == nil)
 			which = me.find(which) or 0;  # turn callsign into index
 
 		me.setup(me.list[which]);
diff --git a/gui/dialogs/model-view-select.xml b/gui/dialogs/model-view-select.xml
index 15bc57ecd..1be27e48a 100644
--- a/gui/dialogs/model-view-select.xml
+++ b/gui/dialogs/model-view-select.xml
@@ -40,7 +40,7 @@
 			var select = func {
 				var e = dlg.initNode("choice", "").getValue();
 				if (e == myself or contains(multiplayer.model.callsign, entries[e]))
-					view.model_view_handler.select(entries[e]);
+					view.model_view_handler.select(which: entries[e], by_callsign: 1);
 				else
 					settimer(func fgcommand("dialog-show", self), 0);
 			}