diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index db80a3eda6..b94121d890 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -139,6 +139,7 @@
 #include "mixer_ui.h"
 #include "mouse_cursors.h"
 #include "note_base.h"
+#include "plugin_setup_dialog.h"
 #include "public_editor.h"
 #include "quantize_dialog.h"
 #include "region_peak_cursor.h"
@@ -840,6 +841,7 @@ Editor::Editor ()
 	/* problematic: has to return a value and thus cannot be x-thread */
 
 	Session::AskAboutPlaylistDeletion.connect_same_thread (*this, boost::bind (&Editor::playlist_deletion_dialog, this, _1));
+	Route::PluginSetup.connect_same_thread (*this, boost::bind (&Editor::plugin_setup, this, _1, _2, _3));
 
 	Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&Editor::parameter_changed, this, _1), gui_context());
 	UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &Editor::ui_parameter_changed));
@@ -4390,6 +4392,14 @@ Editor::playlist_deletion_dialog (boost::shared_ptr<Playlist> pl)
 	return -1;
 }
 
+int
+Editor::plugin_setup (boost::shared_ptr<Route> r, boost::shared_ptr<PluginInsert> pi, ARDOUR::Route::PluginSetupOptions flags)
+{
+	PluginSetupDialog psd (r, pi, flags);
+	int rv = psd.run ();
+	return rv + (psd.fan_out() ? 4 : 0);
+}
+
 bool
 Editor::audio_region_selection_covers (samplepos_t where)
 {
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 8a6da7a1b7..4bc060616f 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -2236,6 +2236,9 @@ private:
 	Command* apply_midi_note_edit_op_to_region (ARDOUR::MidiOperator& op, MidiRegionView& mrv);
 	void apply_midi_note_edit_op (ARDOUR::MidiOperator& op, const RegionSelection& rs);
 
+	/* plugin setup */
+	int plugin_setup (boost::shared_ptr<ARDOUR::Route>, boost::shared_ptr<ARDOUR::PluginInsert>, ARDOUR::Route::PluginSetupOptions);
+
 	/* handling cleanup */
 
 	int playlist_deletion_dialog (boost::shared_ptr<ARDOUR::Playlist>);
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index f880647d54..3a9e4f3f63 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -58,7 +58,6 @@
 #include "keyboard.h"
 #include "midi_time_axis.h"
 #include "mixer_strip.h"
-#include "plugin_setup_dialog.h"
 #include "route_sorter.h"
 #include "vca_time_axis.h"
 #include "utils.h"
@@ -347,8 +346,6 @@ EditorRoutes::EditorRoutes (Editor* e)
 	_display.signal_leave_notify_event().connect (sigc::mem_fun (*this, &EditorRoutes::leave_notify), false);
 
 	_display.set_enable_search (false);
-
-	Route::PluginSetup.connect_same_thread (*this, boost::bind (&EditorRoutes::plugin_setup, this, _1, _2, _3));
 }
 
 EditorRoutes::~EditorRoutes ()
@@ -1874,11 +1871,3 @@ EditorRoutes::show_tracks_with_regions_at_playhead ()
 
 	sync_presentation_info_from_treeview ();
 }
-
-int
-EditorRoutes::plugin_setup (boost::shared_ptr<Route> r, boost::shared_ptr<PluginInsert> pi, ARDOUR::Route::PluginSetupOptions flags)
-{
-	PluginSetupDialog psd (r, pi, flags);
-	int rv = psd.run ();
-	return rv + (psd.fan_out() ? 4 : 0);
-}
diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index 4f4357ba56..adc2001784 100644
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -123,8 +123,6 @@ private:
 	void show_tracks_with_regions_at_playhead ();
 	void selection_changed ();
 
-	int plugin_setup (boost::shared_ptr<ARDOUR::Route>, boost::shared_ptr<ARDOUR::PluginInsert>, ARDOUR::Route::PluginSetupOptions);
-
 	void name_edit (std::string const &, std::string const &);
 	void solo_changed_so_update_mute ();