diff --git a/gtk2_ardour/master_bus_ui.cc b/gtk2_ardour/master_bus_ui.cc
index cd1c7b75c7..a3ccfe9304 100644
--- a/gtk2_ardour/master_bus_ui.cc
+++ b/gtk2_ardour/master_bus_ui.cc
@@ -136,6 +136,12 @@ MasterBusUI::MasterBusUI (Session* sess, PublicEditor& ed)
                                                                             MISSING_INVALIDATOR,
                                                                             boost::bind (&MasterBusUI::update_master_bus_selection, this),
                                                                             gui_context ());
+    EngineStateController::instance()->OutputConfigChanged.connect (_output_mode_connection,
+                                                                    MISSING_INVALIDATOR,
+                                                                    boost::bind (&MasterBusUI::
+                                                                        on_output_connection_mode_changed, this),
+                                                                    gui_context());
+    
     init(sess);
 }
 
diff --git a/gtk2_ardour/master_bus_ui.h b/gtk2_ardour/master_bus_ui.h
index 268750a509..ea9aa2856f 100644
--- a/gtk2_ardour/master_bus_ui.h
+++ b/gtk2_ardour/master_bus_ui.h
@@ -96,6 +96,7 @@ private:
         
 	boost::shared_ptr<ARDOUR::Route> _route;
     PBD::ScopedConnection _mode_connection;
+    PBD::ScopedConnection _output_mode_connection;
 
 	Gtk::Box& _level_meter_home;
 	LevelMeterHBox _level_meter;