diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 7d3d4adf23..1c1ee78bfb 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -294,6 +294,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	void show_ui_prefs ();
 
+	bool check_audioengine();
+
 	void update_tearoff_visibility ();
 
 	void setup_profile ();
@@ -719,7 +721,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	void check_memory_locking ();
 
-	bool check_audioengine();
 	void audioengine_setup ();
 
 	void display_message (const char *prefix, gint prefix_len,
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 8799d6aa8f..fe8a594193 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -442,6 +442,11 @@ EngineControl::on_response (int response_id)
 				on_delete_event ((GdkEventAny*) &ev);
 				break;
 			}
+		case RESPONSE_CANCEL:
+			if (ARDOUR_UI::instance() && ARDOUR_UI::instance()->session_loaded) {
+				ARDOUR_UI::instance()->check_audioengine ();
+			}
+			// fall through
 		default:
 			hide ();
 	}