diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index 10a28b128d..5f5f8d64c3 100644
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -120,7 +120,7 @@ GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::Data
 
 	_rescan_button.set_label (_("Rescan"));
 	_rescan_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REFRESH, Gtk::ICON_SIZE_BUTTON)));
-	_rescan_button.signal_clicked().connect (sigc::mem_fun (*this, &GlobalPortMatrixWindow::rescan));
+	_rescan_button.signal_clicked().connect (sigc::mem_fun (_port_matrix, &GlobalPortMatrix::setup_all_ports));
 	buttons_hbox->pack_start (_rescan_button, Gtk::PACK_SHRINK);
 	
 	Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox);
@@ -129,9 +129,3 @@ GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::Data
 	add (*vbox);
 	show_all ();
 }
-
-void
-GlobalPortMatrixWindow::rescan ()
-{
-	_port_matrix.setup_all_ports ();
-}
diff --git a/gtk2_ardour/global_port_matrix.h b/gtk2_ardour/global_port_matrix.h
index db742252ad..5a00ed4c75 100644
--- a/gtk2_ardour/global_port_matrix.h
+++ b/gtk2_ardour/global_port_matrix.h
@@ -63,11 +63,8 @@ public:
 	GlobalPortMatrixWindow (ARDOUR::Session&, ARDOUR::DataType);
 
 private:
-	void rescan ();
-	
 	GlobalPortMatrix _port_matrix;
 	Gtk::Button _rescan_button;
-
 };