diff --git a/gtk2_ardour/ardour_ui_startup.cc b/gtk2_ardour/ardour_ui_startup.cc
index 70bb636c35..6333b9cbac 100644
--- a/gtk2_ardour/ardour_ui_startup.cc
+++ b/gtk2_ardour/ardour_ui_startup.cc
@@ -550,8 +550,6 @@ ARDOUR_UI::sfsm_response (StartupFSM::Result r)
 
 		if (load_session_from_startup_fsm () == 0) {
 			startup_done ();
-			delete startup_fsm;
-			startup_fsm = 0;
 		} else {
 			DEBUG_TRACE (DEBUG::GuiStartup, "FSM reset\n");
 			startup_fsm->reset ();
@@ -621,6 +619,11 @@ ARDOUR_UI::starting ()
 		 */
 
 		startup_fsm->start ();
+
+		if (startup_fsm->complete()) {
+			delete startup_fsm;
+			startup_fsm = 0;
+		}
 	}
 
 	return 0;
@@ -692,8 +695,13 @@ ARDOUR_UI::load_session_from_startup_fsm ()
 		return 0;
 	}
 
-	return load_session (session_path, session_name, session_template);
+	int ret = load_session (session_path, session_name, session_template);
 
+	if (!ret) {
+		startup_fsm->set_complete ();
+	}
+
+	return ret;
 }
 
 void
diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc
index 7601b6c206..226bf290f8 100644
--- a/gtk2_ardour/startup_fsm.cc
+++ b/gtk2_ardour/startup_fsm.cc
@@ -133,6 +133,10 @@ StartupFSM::start ()
 	DEBUG_TRACE (DEBUG::GuiStartup, string_compose (X_("State at startup: %1\n"), enum_2_string (_state)));
 
 	switch (_state) {
+	case NotWaiting:
+		abort();
+		break;
+
 	case WaitingForPreRelease:
 		show_pre_release_dialog ();
 		break;
@@ -199,6 +203,10 @@ StartupFSM::dialog_response_handler (int response, StartupFSM::DialogID dialog_i
 	 */
 
 	switch (_state) {
+	case NotWaiting:
+		abort();
+		break;
+
 	case WaitingForPreRelease:
 		switch (dialog_id) {
 		case ApplicationPseudoDialog:
diff --git a/gtk2_ardour/startup_fsm.h b/gtk2_ardour/startup_fsm.h
index c53a907154..519ada8ec0 100644
--- a/gtk2_ardour/startup_fsm.h
+++ b/gtk2_ardour/startup_fsm.h
@@ -50,6 +50,7 @@ class StartupFSM : public sigc::trackable
 	};
 
 	enum MainState {
+		NotWaiting,
 		WaitingForPreRelease,
 		WaitingForNewUser,
 		WaitingForSessionPath,
@@ -83,6 +84,9 @@ class StartupFSM : public sigc::trackable
 	bool brand_new_user() const { return new_user; }
 	void handle_path (std::string const & path);
 
+	bool complete() const { return _state == NotWaiting; }
+	void set_complete () { _state = NotWaiting; }
+
   private:
 	bool new_user;
 	bool new_session_required;