diff --git a/src/noggit/application/NoggitApplication.hpp b/src/noggit/application/NoggitApplication.hpp
index d3941f59..00938795 100755
--- a/src/noggit/application/NoggitApplication.hpp
+++ b/src/noggit/application/NoggitApplication.hpp
@@ -45,7 +45,7 @@ namespace Noggit::Application {
         }
 
         BlizzardArchive::ClientData* clientData() { return _client_data.get(); }
-        bool hasClientData() { return _client_data != nullptr; }
+        bool hasClientData() const { return _client_data != nullptr; }
         void setClientData(std::shared_ptr<BlizzardArchive::ClientData> data) { _client_data = data; }
 
         void initalize(int argc, char* argv[], std::vector<bool> Parser);
diff --git a/src/noggit/ui/windows/noggitWindow/NoggitWindow.cpp b/src/noggit/ui/windows/noggitWindow/NoggitWindow.cpp
index 999f887e..666bcea3 100755
--- a/src/noggit/ui/windows/noggitWindow/NoggitWindow.cpp
+++ b/src/noggit/ui/windows/noggitWindow/NoggitWindow.cpp
@@ -481,7 +481,14 @@ namespace Noggit::Ui::Windows
       promptExit(event);
     } else
     {
-      event->accept();
+      if (exit_to_project_selection)
+      {
+        auto noggit = Noggit::Application::NoggitApplication::instance();
+        auto project_selection = new Noggit::Ui::Windows::NoggitProjectSelectionWindow(noggit);
+        project_selection->show();
+      }
+      else
+        event->accept();
     }
     exit_to_project_selection = false;
   }