diff --git a/Assets/Scripts/GameModeManager.cs b/Assets/Scripts/GameModeManager.cs
index d9804f9..9fea14b 100644
--- a/Assets/Scripts/GameModeManager.cs
+++ b/Assets/Scripts/GameModeManager.cs
@@ -223,6 +223,11 @@ public class GameModeManager : MonoBehaviour
         painter = null;
         PainterChanged?.Invoke(null);
 
+        // No SwitchTo runs here (the cycle is now empty), so notify mode-following UI explicitly that
+        // there is no active mode - otherwise the paint HUD, which only hides via ModeChanged, would stay
+        // open back in Main after a shutdown that happened while PaintMode was active.
+        ModeChanged?.Invoke(null);
+
         if (cameraInput)
             cameraInput.LookMode = ThirdPersonOrbitInput.OrbitLookMode.Disabled;