diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 84d6abe168..c10a43cf2b 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -329,8 +329,6 @@ MackieControlProtocol::get_sorted_stripables()
 				sorted.push_back (s);
 			}
 			break;
-		case Plugins:
-			break;
 		case Auxes: // in ardour, for now aux and buss are same. for mixbus, "Busses" are mixbuses, "Auxes" are ardour buses
 #ifdef MIXBUS
 			if (!s->mixbus() && !is_track(s) && !s->presentation_info().hidden())
@@ -341,7 +339,7 @@ MackieControlProtocol::get_sorted_stripables()
 				sorted.push_back (s);
 			}
 			break;
-		case Hidden: // Show all the tracks we have hidden
+		case Outputs: // Show all the tracks we have hidden
 			if (s->presentation_info().hidden()) {
 				// maybe separate groups
 				sorted.push_back (s);
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 2d124fe103..85282726b7 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -92,13 +92,14 @@ class MackieControlProtocol
 
 	enum ViewMode {
 		Mixer,
-		AudioTracks,
 		MidiTracks,
-		Busses,
+		Inputs,
+		AudioTracks,
+		AudioInstr,
 		Auxes,
+		Busses,
+		Outputs,
 		Selected,
-		Hidden,
-		Plugins,
 	};
 
 	enum FlipMode {
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index da4a7e523b..b1818418d6 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -1116,7 +1116,7 @@ MackieControlProtocol::outputs_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::outputs_release (Mackie::Button&)
 {
-	set_view_mode (Hidden);
+	set_view_mode (Outputs);
 	return none;
 }
 Mackie::LedState
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 7d441b84e8..21b36ccf62 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -1330,11 +1330,6 @@ Surface::update_view_mode_display (bool with_helpful_text)
 		id = Button::MidiTracks;
 		text = _("MIDI Tracks");
 		break;
-	case MackieControlProtocol::Plugins:
-		show_two_char_display ("PL");
-		id = Button::Plugin;
-		text = _("Plugins");
-		break;
 	case MackieControlProtocol::Busses:
 		show_two_char_display ("BS");
 		id = Button::Busses;
@@ -1349,7 +1344,7 @@ Surface::update_view_mode_display (bool with_helpful_text)
 		id = Button::Aux;
 		text = _("Auxes");
 		break;
-	case MackieControlProtocol::Hidden:
+	case MackieControlProtocol::Outputs:
 		show_two_char_display ("HI");
 		id = Button::Outputs;
 		text = _("Hidden Tracks");
@@ -1372,6 +1367,9 @@ Surface::update_view_mode_display (bool with_helpful_text)
 	view_mode_buttons.push_back (Button::Aux);
 	view_mode_buttons.push_back (Button::Outputs);
 	view_mode_buttons.push_back (Button::User);
+	view_mode_buttons.push_back (Button::Inputs);
+	view_mode_buttons.push_back (Button::AudioInstruments);
+	view_mode_buttons.push_back (Button::Outputs);
 
 	if (id >= 0) {