diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 69c405bb71..d92c7f9475 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -2302,6 +2302,10 @@ RCOptionEditor::RCOptionEditor ()
 
 	add_option (_("General"), new OptionEditorHeading (_("Audio/MIDI Setup")));
 
+	add_option (_("General"),
+			new RcActionButton (_("Show Audio/MIDI Setup Window"),
+				sigc::mem_fun (*this, &RCOptionEditor::show_audio_setup)));
+
 	bo = new BoolOption (
 		     "try-autostart-engine",
 		     _("Try to auto-launch audio/midi engine"),
@@ -3448,6 +3452,10 @@ These settings will only take effect after %1 is restarted.\n\
 
 	add_option (_("Transport/Chase"), new OptionEditorHeading (_("Transport Masters")));
 
+	add_option (_("Transport/Chase"),
+			new RcActionButton (_("Show Transport Masters Window"),
+				sigc::mem_fun (*this, &RCOptionEditor::show_transport_masters)));
+
 	_sync_framerate = new BoolOption (
 		     "timecode-sync-frame-rate",
 		     _("Match session video frame rate to external timecode"),
@@ -4449,6 +4457,16 @@ RCOptionEditor::parameter_changed (string const & p)
 	}
 }
 
+void RCOptionEditor::show_audio_setup () {
+	Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("Window", "toggle-audio-midi-setup");
+	tact->set_active();
+}
+
+void RCOptionEditor::show_transport_masters () {
+	Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("Window", "toggle-transport-masters");
+	tact->set_active();
+}
+
 void RCOptionEditor::plugin_scan_refresh () {
 	/* first argument says discover new plugins, second means be verbose */
 	PluginScanDialog psd (false, true);
diff --git a/gtk2_ardour/rc_option_editor.h b/gtk2_ardour/rc_option_editor.h
index e8dab2af20..e175cffea7 100644
--- a/gtk2_ardour/rc_option_editor.h
+++ b/gtk2_ardour/rc_option_editor.h
@@ -63,6 +63,9 @@ private:
 	PBD::ScopedConnection parameter_change_connection;
 	PBD::ScopedConnection engine_started_connection;
 
+	void show_audio_setup ();
+	void show_transport_masters ();
+
 	/* plugin actions */
 	void plugin_scan_refresh ();
 	void plugin_reset_stats ();