diff --git a/Dalamud/Game/Internal/DalamudAtkTweaks.cs b/Dalamud/Game/Internal/DalamudAtkTweaks.cs
index 8c5059720..f917e4f57 100644
--- a/Dalamud/Game/Internal/DalamudAtkTweaks.cs
+++ b/Dalamud/Game/Internal/DalamudAtkTweaks.cs
@@ -76,7 +76,7 @@ namespace Dalamud.Game.Internal
 
         private IntPtr AtkUnitBaseReceiveGlobalEventDetour(AtkUnitBase* thisPtr, ushort cmd, uint a3, IntPtr a4, uint* a5)
         {
-            Log.Information("{0}: cmd#{1} a3#{2} - HasAnyFocus:{3}", Marshal.PtrToStringAnsi(new IntPtr(thisPtr->Name)), cmd, a3, WindowSystem.HasAnyWindowSystemFocus);
+            // Log.Information("{0}: cmd#{1} a3#{2} - HasAnyFocus:{3}", Marshal.PtrToStringAnsi(new IntPtr(thisPtr->Name)), cmd, a3, WindowSystem.HasAnyWindowSystemFocus);
 
             // "Close Addon"
             if (cmd == 12 && WindowSystem.HasAnyWindowSystemFocus)
@@ -87,6 +87,9 @@ namespace Dalamud.Game.Internal
 
         private void AgentHudOpenSystemMenuDetour(void* thisPtr, AtkValue* atkValueArgs, uint menuSize)
         {
+            if (WindowSystem.HasAnyWindowSystemFocus)
+                return;
+
             var configuration = Service<DalamudConfiguration>.Get();
 
             if (!configuration.DoButtonsSystemMenu)
diff --git a/Dalamud/Interface/Windowing/Window.cs b/Dalamud/Interface/Windowing/Window.cs
index 8850727d2..7764e1e2c 100644
--- a/Dalamud/Interface/Windowing/Window.cs
+++ b/Dalamud/Interface/Windowing/Window.cs
@@ -2,8 +2,6 @@ using System.Numerics;
 
 using Dalamud.Game.ClientState.Keys;
 using ImGuiNET;
-using Microsoft.CodeAnalysis;
-using Serilog;
 
 namespace Dalamud.Interface.Windowing
 {