diff --git a/.vscode/settings.json b/.vscode/settings.json
index 54d21e9c8..d5d9a24c5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -51,5 +51,5 @@
         "temp/": true,
         "Temp/": true
     },
-    "dotnet.defaultSolution": "HeavenStudio-AstrlJelly.sln"
+    "dotnet.defaultSolution": "HeavenStudio.sln"
 }
\ No newline at end of file
diff --git a/Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs b/Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs
index e3813c5a7..094055487 100644
--- a/Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs
+++ b/Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs
@@ -91,8 +91,16 @@ namespace HeavenStudio.InputSystem
 
         public override void UpdateState()
         {
-            if (GameManager.instance == null) return;
-            Camera cam = GameManager.instance.CursorCam;
+            Camera cam;
+            if (GameManager.instance == null || GameManager.instance.CursorCam == null)
+            {
+                cam = Camera.main;
+            }
+            else
+            {
+                cam = GameManager.instance.CursorCam;
+            }
+            if (cam == null) return;
 
             hasFlicked = false;
             hasSwiped = false;
diff --git a/Assets/Scripts/TitleManager.cs b/Assets/Scripts/TitleManager.cs
index 5de732692..4d2a0eac6 100644
--- a/Assets/Scripts/TitleManager.cs
+++ b/Assets/Scripts/TitleManager.cs
@@ -142,15 +142,15 @@ namespace HeavenStudio
                             SoundByte.PlayOneShot("ui/UIEnter");
 
                             var nextController = newController;
+                            var lastController = PlayerInput.GetInputController(1);
 
-                            if (newController is InputMouse)
+                            if ((newController is InputMouse) && (lastController is not InputMouse))
                             {
                                 Debug.Log("Mouse used, selecting keyboard instead");
                                 nextController = controllers[0];
                             }
                             Debug.Log("Assigning controller: " + newController.GetDeviceName());
 
-                            var lastController = PlayerInput.GetInputController(1);
                             if (lastController != nextController)
                             {
                                 if (nextController == null)