diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 2db75d5dcb..615e79e184 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -1053,6 +1053,7 @@ EngineControl::get_device_name (const string& driver, const string& human_readab
 		   another computer system in it
 		*/
 		MessageDialog msg (_("You need to choose an audio device first."));
+                msg.set_position (WIN_POS_MOUSE);
 		msg.run ();
 		return string();
 	}
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index a811fd7cc1..dbdaa2a5f0 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -623,7 +623,10 @@ void
 ArdourStartup::on_apply ()
 {
 	if (engine_dialog) {
-		engine_dialog->setup_engine ();
+		if (engine_dialog->setup_engine ()) {
+                        set_current_page (audio_page_index);
+                        return;
+                }
 	}
 
 	if (config_modified) {