diff --git a/Intersect.Client.Core/Interface/Game/GameInterface.cs b/Intersect.Client.Core/Interface/Game/GameInterface.cs
index 35fe9101e4..b11018bdf9 100644
--- a/Intersect.Client.Core/Interface/Game/GameInterface.cs
+++ b/Intersect.Client.Core/Interface/Game/GameInterface.cs
@@ -569,6 +569,12 @@ public bool CloseAllWindows()
             closedWindows = true;
         }
 
+        if (TargetContextMenu.IsVisible)
+        {
+            TargetContextMenu.ToggleHidden();
+            closedWindows = true;
+        }
+
         return closedWindows;
     }