diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ac5c52dc3f..062c3f3e9c 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -5838,6 +5838,8 @@ Editor::output_connection_mode_changed ()
             delete tv;
         }
     }
+    
+    _routes->redisplay ();
 }
 
 
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 2551102e3e..37fddcc11f 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -568,7 +568,7 @@ EditorRoutes::redisplay_real ()
 void
 EditorRoutes::redisplay ()
 {
-	if (_no_redisplay || !_session || _session->deletion_in_progress()) {
+	if (_no_redisplay || !_session || _session->deletion_in_progress() || _session->reconnection_in_progress() ) {
 		return;
 	}
 
diff --git a/gtk2_ardour/route_inspector.cc b/gtk2_ardour/route_inspector.cc
index 03c567bd0b..d05edf99bc 100644
--- a/gtk2_ardour/route_inspector.cc
+++ b/gtk2_ardour/route_inspector.cc
@@ -84,7 +84,7 @@ RouteInspector::init ()
 		color_button[i]->signal_clicked.connect (sigc::mem_fun (*this, &RouteInspector::color_button_clicked));
 	}
 
-    _session->session_routes_reconnected.connect(_input_output_channels_update, invalidator (*this), boost::bind (&RouteInspector::update_inspector_info_panel, this), gui_context());
+    EngineStateController::instance()->OutputConfigChanged.connect(_input_output_channels_update, invalidator (*this), boost::bind (&RouteInspector::update_inspector_info_panel, this), gui_context());
 }
 
 RouteInspector::~RouteInspector ()
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index a997ca7c02..f69b81c160 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -719,7 +719,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 	PBD::Signal1<void,bool> SoloActive;
 	PBD::Signal0<void> SoloChanged;
 	PBD::Signal0<void> IsolatedChanged;
-    PBD::Signal0<void> session_routes_reconnected;
 
 	/* monitor/master out */
 
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 028331733b..3717a39419 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -2499,9 +2499,6 @@ Session::reconnect_existing_routes (bool withLock, bool reconnect_master, bool r
     }
     
     graph_reordered ();
-    
-    //emit signal
-    session_routes_reconnected ();
 }