diff --git a/repertory/repertory/src/ui/ui_server.cpp b/repertory/repertory/src/ui/ui_server.cpp
index b3c34215..a8d98bd1 100644
--- a/repertory/repertory/src/ui/ui_server.cpp
+++ b/repertory/repertory/src/ui/ui_server.cpp
@@ -961,9 +961,13 @@ void ui_server::start() {
         }
       }).join();
 
-      launch_ui();
-
       notify_and_unlock(nonce_lock);
+
+      if (should_launch) {
+        launch_ui();
+        should_launch = false;
+      }
+
       server_.listen_after_bind();
     } else {
       utils::error::raise_error(function_name,