diff --git a/GlitchyEditor/src/EditorLayer.bf b/GlitchyEditor/src/EditorLayer.bf
index 88abe18..8c9ffd1 100644
--- a/GlitchyEditor/src/EditorLayer.bf
+++ b/GlitchyEditor/src/EditorLayer.bf
@@ -109,7 +109,9 @@ namespace GlitchyEditor
 
 			if (args.Count >= 1)
 				LoadSceneFile(args[0]);
-			else
+
+			// Create a new scene, if LoadSceneFile failed
+			if (_activeScene == null)
 				NewScene();
 		}
 
@@ -199,7 +201,6 @@ namespace GlitchyEditor
 			if (_sceneState != .Edit && _isPaused)
 				updateMode = .None;
 
-
 			_activeScene.Update(gameTime, updateMode);
 
 			// Clear the swapchain-buffer