diff --git a/SHADE_Managed/src/Engine/Application.cxx b/SHADE_Managed/src/Engine/Application.cxx
index c19bafa6..06ad632f 100644
--- a/SHADE_Managed/src/Engine/Application.cxx
+++ b/SHADE_Managed/src/Engine/Application.cxx
@@ -44,6 +44,10 @@ namespace SHADE
 
         return false;
     }
+    bool Application::IsEditor::get()
+    {
+        return SHSystemManager::GetSystem<SHEditor>() != nullptr;
+    }
     int Application::WindowWidth::get()
     {
         return SHGraphicsSystemInterface::GetWindowWidth();
@@ -66,6 +70,9 @@ namespace SHADE
     /*---------------------------------------------------------------------------------*/
     void Application::Quit()
     {
-        SHGraphicsSystemInterface::CloseWindow();
+        if (!IsEditor)
+        {
+            SHGraphicsSystemInterface::CloseWindow();
+        }
     }
 }
diff --git a/SHADE_Managed/src/Engine/Application.hxx b/SHADE_Managed/src/Engine/Application.hxx
index 8629cf75..4467ec3b 100644
--- a/SHADE_Managed/src/Engine/Application.hxx
+++ b/SHADE_Managed/src/Engine/Application.hxx
@@ -43,6 +43,13 @@ namespace SHADE
             bool get();
         }
         /// <summary>
+        /// True if the engine is running in the editor.
+        /// </summary>
+        static property bool IsEditor
+        {
+            bool get();
+        }
+        /// <summary>
         /// Retrieves the designated width of the current window.
         /// </summary>
         static property int WindowWidth
@@ -71,6 +78,7 @@ namespace SHADE
         /*-----------------------------------------------------------------------------*/
         /// <summary>
         /// Marks the application to stop at the end of the current frame.
+        /// If running in the editor, this function does nothing.
         /// </summary>
         static void Quit();
     };