diff --git a/Mappy/Mappy.csproj b/Mappy/Mappy.csproj
index beb2775..4ea71de 100644
--- a/Mappy/Mappy.csproj
+++ b/Mappy/Mappy.csproj
@@ -4,7 +4,7 @@
         <Name>HSMappy</Name>
         <InternalName>HSMappy</InternalName>
         <Author>Knack117</Author>
-        <Version>1.0.0.5</Version>
+        <Version>1.0.0.6</Version>
         <Punchline>A more versatile in-game map.</Punchline>
         <Description>Replaces the in-game map with an ImGui implementation with several additional features. Fork with minimap improvements, quest radius on minimap, and more.</Description>
         <RepoUrl>http://brassnet.ddns.net:33983/KnackAtNite/HSMappy</RepoUrl>
diff --git a/Mappy/Windows/MinimapWindow.cs b/Mappy/Windows/MinimapWindow.cs
index b3c86a4..29a997e 100644
--- a/Mappy/Windows/MinimapWindow.cs
+++ b/Mappy/Windows/MinimapWindow.cs
@@ -11,6 +11,8 @@ namespace Mappy.Windows;
 
 public class MinimapWindow : Window
 {
+    private bool _wasLoggedIn;
+
     public MinimapWindow() : base("HSMappy Minimap###HSMappyMinimap", new Vector2(200.0f, 200.0f))
     {
         DisableWindowSounds = true;
@@ -22,8 +24,18 @@ public class MinimapWindow : Window
 
     public override void PreOpenCheck()
     {
-        if (Service.ClientState is { IsLoggedIn: false } or { IsPvP: true })
+        var isLoggedIn = Service.ClientState is { IsLoggedIn: true, IsPvP: false };
+        if (!isLoggedIn)
+        {
             IsOpen = false;
+            _wasLoggedIn = false;
+            return;
+        }
+
+        // Restore minimap when transitioning from login screen to in-game (ShowMinimap persists in config)
+        if (!_wasLoggedIn && System.SystemConfig.ShowMinimap)
+            UnCollapseOrShow();
+        _wasLoggedIn = true;
     }
 
     protected override unsafe void DrawContents()
diff --git a/Mappy/pluginmaster.json b/Mappy/pluginmaster.json
index 376cabc..b8287bc 100644
--- a/Mappy/pluginmaster.json
+++ b/Mappy/pluginmaster.json
@@ -1 +1 @@
-[{"Author":"Knack117","Name":"HSMappy","Punchline":"A more versatile in-game map.","Description":"Replaces the in-game map with an ImGui implementation with several additional features. Fork with minimap improvements, quest radius on minimap, white gradient player cone, and more.","Changelog":"1.0.0.5: Fix crash when map texture path is invalid (ArgumentOutOfRangeException in Lumina GetFileHash). 1.0.0.4: Temp marker circle refreshes when quest objective is progressed. 1.0.0.3: Fix marker cache refresh after quest turn-in; invalidate temp cache so old markers don't persist. 1.0.0.2: Red direction arrow on minimap pointing to player flag. 1.0.0.1: Duty List quest click keeps Area Map open; player flags show on minimap. 1.0.0.0: Initial HSMappy release. Minimap: quest radius circle (orange, transparent), tooltip; cone drawn under markers; white gradient cone; /hsmappy commands.","InternalName":"HSMappy","AssemblyVersion":"1.0.0.5","RepoUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy","ApplicableVersion":"any","Tags":["map","mapping","overlay","utility"],"CategoryTags":["jobs"],"DalamudApiLevel":14,"DownloadLinkInstall":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.5/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.5/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.5/latest.zip","LastUpdate":"1772146500"}]
+[{"Author":"Knack117","Name":"HSMappy","Punchline":"A more versatile in-game map.","Description":"Replaces the in-game map with an ImGui implementation with several additional features. Fork with minimap improvements, quest radius on minimap, white gradient player cone, and more.","Changelog":"1.0.0.6: Minimap stays open after client restart (restore on login). 1.0.0.5: Fix crash when map texture path is invalid (ArgumentOutOfRangeException in Lumina GetFileHash). 1.0.0.4: Temp marker circle refreshes when quest objective is progressed. 1.0.0.3: Fix marker cache refresh after quest turn-in; invalidate temp cache so old markers don't persist. 1.0.0.2: Red direction arrow on minimap pointing to player flag. 1.0.0.1: Duty List quest click keeps Area Map open; player flags show on minimap. 1.0.0.0: Initial HSMappy release. Minimap: quest radius circle (orange, transparent), tooltip; cone drawn under markers; white gradient cone; /hsmappy commands.","InternalName":"HSMappy","AssemblyVersion":"1.0.0.6","RepoUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy","ApplicableVersion":"any","Tags":["map","mapping","overlay","utility"],"CategoryTags":["jobs"],"DalamudApiLevel":14,"DownloadLinkInstall":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.6/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.6/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.6/latest.zip","LastUpdate":"1772228578"}]