diff --git a/src/ui/fortmanager.cpp b/src/ui/fortmanager.cpp
index 0dec268c..b470b1d4 100644
--- a/src/ui/fortmanager.cpp
+++ b/src/ui/fortmanager.cpp
@@ -443,8 +443,12 @@ void FortManager::show()
         windowManager->showHomeWindow();
     }
 
-    if (iniUser.graphWindowVisible()) {
+    if (iniUser.graphWindowVisible() || iniUser.graphWindowHideOnClose()) {
         windowManager->showGraphWindow();
+
+        if (!iniUser.graphWindowVisible()) {
+            windowManager->closeGraphWindow();
+        }
     }
 }