diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 15c04c8e55..08d9cb2929 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -352,7 +352,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 	_route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_property_changed, this, _1), gui_context());
 	_route->presentation_info().PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_gui_changed, this, _1), gui_context ());
 
-	_route->polarity()->ConfigurationChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::polarity_configuration_changed, this, _1, _2), gui_context());
+	_route->polarity()->ConfigurationChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::setup_invert_buttons, this), gui_context());
 
 	if (_session->writable() && is_track()) {
 		boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
@@ -2017,12 +2017,6 @@ RouteUI::parameter_changed (string const & p)
 	}
 }
 
-void
-RouteUI::polarity_configuration_changed (const ChanCount in, const ChanCount out)
-{
-	setup_invert_buttons();
-}
-
 void
 RouteUI::setup_invert_buttons ()
 {
@@ -2068,6 +2062,8 @@ RouteUI::setup_invert_buttons ()
 
 	_invert_button_box.set_spacing (1);
 	_invert_button_box.show_all ();
+
+	set_invert_button_state ();
 }
 
 void
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 85e9ebff22..82a0ee1ec4 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -186,7 +186,6 @@ public:
 	virtual void processors_changed (ARDOUR::RouteProcessorChange) {}
 	void route_rec_enable_changed();
 	void session_rec_enable_changed();
-	void polarity_configuration_changed (const ARDOUR::ChanCount in, const ARDOUR::ChanCount out);
 
 	void build_solo_menu ();