diff --git a/Robust.Client/UserInterface/CustomControls/BaseWindow.cs b/Robust.Client/UserInterface/CustomControls/BaseWindow.cs
index deb3d338e..42184c87d 100644
--- a/Robust.Client/UserInterface/CustomControls/BaseWindow.cs
+++ b/Robust.Client/UserInterface/CustomControls/BaseWindow.cs
@@ -37,8 +37,8 @@ namespace Robust.Client.UserInterface.CustomControls
                 return;
             }
 
-            OnClose?.Invoke();
             Parent.RemoveChild(this);
+            OnClose?.Invoke();
         }
 
         protected internal override void KeyBindDown(GUIBoundKeyEventArgs args)