diff --git a/src/render/decorations/CHyprBorderDecoration.cpp b/src/render/decorations/CHyprBorderDecoration.cpp
index 708215b6..ddb38c6e 100644
--- a/src/render/decorations/CHyprBorderDecoration.cpp
+++ b/src/render/decorations/CHyprBorderDecoration.cpp
@@ -1,6 +1,7 @@
 #include "CHyprBorderDecoration.hpp"
 #include "../../Compositor.hpp"
 #include "../../config/ConfigValue.hpp"
+#include "../../managers/eventLoop/EventLoopManager.hpp"
 
 CHyprBorderDecoration::CHyprBorderDecoration(PHLWINDOW pWindow) : IHyprWindowDecoration(pWindow) {
     m_pWindow = pWindow;
@@ -82,8 +83,17 @@ eDecorationType CHyprBorderDecoration::getDecorationType() {
 }
 
 void CHyprBorderDecoration::updateWindow(PHLWINDOW) {
-    if (m_pWindow->getRealBorderSize() != m_seExtents.topLeft.x)
-        g_pDecorationPositioner->repositionDeco(this);
+    auto borderSize = m_pWindow->getRealBorderSize();
+
+    if (borderSize == m_iLastBorderSize)
+        return;
+
+    if (borderSize <= 0 && m_iLastBorderSize <= 0)
+        return;
+
+    m_iLastBorderSize = borderSize;
+
+    g_pEventLoopManager->doLater([this]() { g_pDecorationPositioner->repositionDeco(this); });
 }
 
 void CHyprBorderDecoration::damageEntire() {
diff --git a/src/render/decorations/CHyprBorderDecoration.hpp b/src/render/decorations/CHyprBorderDecoration.hpp
index 8ad3263e..0e196565 100644
--- a/src/render/decorations/CHyprBorderDecoration.hpp
+++ b/src/render/decorations/CHyprBorderDecoration.hpp
@@ -36,6 +36,8 @@ class CHyprBorderDecoration : public IHyprWindowDecoration {
 
     CBox         m_bAssignedGeometry = {0};
 
+    int          m_iLastBorderSize = -1;
+
     CBox         assignedBoxGlobal();
     bool         doesntWantBorders();
 };