diff --git a/Assets/Scripts/GlobalGameManager.cs b/Assets/Scripts/GlobalGameManager.cs
index 8a5d3331a..8c2555002 100644
--- a/Assets/Scripts/GlobalGameManager.cs
+++ b/Assets/Scripts/GlobalGameManager.cs
@@ -391,7 +391,7 @@ namespace HeavenStudio
         {
             if (SceneManager.GetActiveScene().name != "Editor") return true;
             Editor.Editor.instance.ShowQuitPopUp(true);
-            return false;
+            return Editor.Editor.instance.ShouldQuit;
         }
     }
 }
diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs
index 7127d31ef..e69887611 100644
--- a/Assets/Scripts/LevelEditor/Editor.cs
+++ b/Assets/Scripts/LevelEditor/Editor.cs
@@ -154,8 +154,11 @@ namespace HeavenStudio.Editor
             _confirmQuitMain.SetActive(show);
         }
 
+        public bool ShouldQuit = false;
+
         public void QuitGame()
         {
+            ShouldQuit = true;
             Application.Quit();
         }