diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 784076e6be..d6697f9de7 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -1025,7 +1025,11 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry*
 
 		if (_session->engine().connected()) {
 			/* XXX giving an error message here is hard, because we may be in the midst of a button press */
-			toggle_edit_processor (processor);
+			if (Config->get_use_plugin_own_gui ()) {
+				toggle_edit_processor (processor);
+			} else {
+				toggle_edit_generic_processor (processor);
+			}
 		}
 		ret = true;
 
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index ec3dd466f4..5c67005386 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1521,7 +1521,7 @@ RCOptionEditor::RCOptionEditor ()
 
 	add_option (S_("Visual|Interface"),
 	     new BoolOption (
-		     "widget_prelight",
+		     "widget-prelight",
 		     _("Graphically indicate mouse pointer hovering over various widgets"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_widget_prelight),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_widget_prelight)
@@ -1531,6 +1531,13 @@ RCOptionEditor::RCOptionEditor ()
 	/* font scaling does nothing with GDK/Quartz */
 	add_option (S_("Visual|Interface"), new FontScalingOptions (_rc_config));
 #endif
+	add_option (S_("Visual|Interface"),
+		    new BoolOption (
+			    "use-own-plugin-gui",
+			    _("Use plugins' own interface instead of Ardour's basic one"),
+			    sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui),
+			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui)
+			    ));
 
 	/* The names of these controls must be the same as those given in MixerStrip
 	   for the actual widgets being controlled.
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index eac7288c59..5c38c33af1 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -171,6 +171,7 @@ CONFIG_VARIABLE (gain_t, max_gain, "max-gain", 2.0) /* +6.0dB */
 CONFIG_VARIABLE (bool, update_editor_during_summary_drag, "update-editor-during-summary-drag", true)
 CONFIG_VARIABLE (bool, never_display_periodic_midi, "never-display-periodic-midi", true)
 CONFIG_VARIABLE (bool, sound_midi_notes, "sound-midi-notes", false)
+CONFIG_VARIABLE (bool, use_plugin_own_gui, "use-plugin-own-gui", true)
 
 /* denormal management */