diff --git a/Content.Client/Administration/AdminSystem.Menu.cs b/Content.Client/Administration/AdminSystem.Menu.cs
index 620fffec0c..6f02c3df1c 100644
--- a/Content.Client/Administration/AdminSystem.Menu.cs
+++ b/Content.Client/Administration/AdminSystem.Menu.cs
@@ -94,7 +94,12 @@ namespace Content.Client.Administration
 
         public void Open()
         {
-            _window ??= new AdminMenuWindow();
+            if (_window == null)
+            {
+                _window = new AdminMenuWindow();
+                _window.OnClose += Close;
+            }
+
             _window.PlayerTabControl.OnEntryPressed += PlayerTabEntryPressed;
             _window.OpenCentered();
         }