diff --git a/OTRGui/src/game/game.cpp b/OTRGui/src/game/game.cpp
index 18226ae64..ff7e7a22b 100644
--- a/OTRGui/src/game/game.cpp
+++ b/OTRGui/src/game/game.cpp
@@ -149,7 +149,7 @@ void OTRGame::draw() {
 	DrawTexture(titleTex, windowSize.x / 2 - titleTex.width / 2, titlebar.height / 2 - titleTex.height / 2, WHITE);
 
 	if (UIUtils::GuiIcon("Exit", windowSize.x - 36, titlebar.height / 2 - 10) && (extracting && currentStep.find("Done") != std::string::npos || !extracting)) {
-		CloseWindow();
+		closeRequested = true;
 	}
 
 	BeginMode3D(camera);
diff --git a/OTRGui/src/game/game.h b/OTRGui/src/game/game.h
index b284f857a..bd74b1c3f 100644
--- a/OTRGui/src/game/game.h
+++ b/OTRGui/src/game/game.h
@@ -19,6 +19,8 @@ public:
     void update();
     void draw();
     void exit();
+
+    inline bool CloseRequested() { return closeRequested; }
 protected:
     void LoadTexture(const std::string& name, const std::string& path) {
         const Image tmp = LoadImage(path.c_str());
@@ -32,6 +34,9 @@ protected:
         SetTextureFilter(font.texture, TEXTURE_FILTER_POINT);
         Fonts[name] = font;
     }
+
+private:
+    bool closeRequested = false;
 };
 
 extern OTRGame* Game;
diff --git a/OTRGui/src/main.cpp b/OTRGui/src/main.cpp
index a866673c5..2b3e40a7c 100644
--- a/OTRGui/src/main.cpp
+++ b/OTRGui/src/main.cpp
@@ -17,7 +17,7 @@ void UpdateDrawFrame(void) {
 }
 
 int main() {
-	constexpr Vector2 windowSize = Vector2(400, 200);
+    constexpr Vector2 windowSize = Vector2(400, 200);
     SetConfigFlags(FLAG_VSYNC_HINT);
     SetConfigFlags(FLAG_WINDOW_HIGHDPI);
     SetConfigFlags(FLAG_WINDOW_UNDECORATED);
@@ -32,7 +32,7 @@ int main() {
     Game = new OTRGame();
     Game->preload();
     Game->init();
-    while(!WindowShouldClose()) {
+    while(!WindowShouldClose() && !Game->CloseRequested()) {
         UpdateDrawFrame();
     }
     CloseWindow();