diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index e74ee8fa04..406bf223ce 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -342,7 +342,8 @@ ARDOUR_UI::toggle_editor_and_mixer ()
 		} else if (_tabs.get_current_page() == _tabs.page_num (mixer->contents())) {
 			_tabs.set_current_page (_tabs.page_num (editor->contents()));
 		} else {
-			/* do nothing */
+			/* go to mixer */
+			_tabs.set_current_page (_tabs.page_num (mixer->contents()));
 		}
 		return;
 	}