diff --git a/Dalamud/Interface/Windowing/Window.cs b/Dalamud/Interface/Windowing/Window.cs
index ed9318e49..7ecd5e15c 100644
--- a/Dalamud/Interface/Windowing/Window.cs
+++ b/Dalamud/Interface/Windowing/Window.cs
@@ -672,13 +672,16 @@ public abstract class Window
                 Task.FromResult<IDalamudTextureWrap>(tex));
         }
 
-        if (isErrorStylePushed)
+        if (!this.hasError)
         {
-            Style.StyleModelV1.DalamudStandard.Pop();
+            this.PostDraw();
         }
         else
         {
-            this.PostDraw();
+            if (isErrorStylePushed)
+            {
+                Style.StyleModelV1.DalamudStandard.Pop();
+            }
         }
 
         this.PostHandlePreset(persistence);