diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 1e9236984e..cd217d6102 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -52,6 +52,7 @@
 #include "editor_cursors.h"
 #include "keyboard.h"
 #include "midi_region_view.h"
+#include "mixer_strip.h"
 #include "pianoroll.h"
 #include "selection_properties_box.h"
 #include "sfdb_ui.h"
@@ -1221,6 +1222,13 @@ Editor::presentation_info_changed (PropertyChange const & what_changed)
 		}
 	}
 
+	if (current_mixer_strip && what_changed.contains (Properties::hidden)) {
+		/* don't show hidden tracks in editor mixer */
+		if (current_mixer_strip->route()->is_hidden () && att_left_visible ()) {
+			show_editor_mixer (true);
+		}
+	}
+
 	/* STEP 4: update Editor::track_views */
 
 	PropertyChange soh;