diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 962046165b..09ea89216a 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -418,12 +418,14 @@ ArdourStartup::setup_final_page ()
 void
 ArdourStartup::on_cancel ()
 {
+	_applying = false;
 	gtk_main_quit ();
 }
 
 void
 ArdourStartup::on_close ()
 {
+	_applying = false;
 	gtk_main_quit ();
 }