diff --git a/src/Window.cpp b/src/Window.cpp
index e9af0349..30a0694b 100644
--- a/src/Window.cpp
+++ b/src/Window.cpp
@@ -23,7 +23,7 @@ CWindow::~CWindow() {
 wlr_box CWindow::getFullWindowBoundingBox() {
     static auto* const PBORDERSIZE = &g_pConfigManager->getConfigValuePtr("general:border_size")->intValue;
 
-    SWindowDecorationExtents maxExtents = {{*PBORDERSIZE + 1, *PBORDERSIZE + 1}, {*PBORDERSIZE + 1, *PBORDERSIZE + 1}};
+    SWindowDecorationExtents maxExtents = {{*PBORDERSIZE + 2, *PBORDERSIZE + 2}, {*PBORDERSIZE + 2, *PBORDERSIZE + 2}};
 
     for (auto& wd : m_dWindowDecorations) {
 
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
index 2f302b6a..d5b505cc 100644
--- a/src/layout/DwindleLayout.cpp
+++ b/src/layout/DwindleLayout.cpp
@@ -234,6 +234,8 @@ void CHyprDwindleLayout::applyNodeDataToWindow(SDwindleNodeData* pNode, bool for
     }
 
     if (force) {
+        g_pHyprRenderer->damageWindow(PWINDOW);
+
         PWINDOW->m_vRealPosition.warp();
         PWINDOW->m_vRealSize.warp();
 
diff --git a/src/layout/MasterLayout.cpp b/src/layout/MasterLayout.cpp
index d48905e1..f8ee4b78 100644
--- a/src/layout/MasterLayout.cpp
+++ b/src/layout/MasterLayout.cpp
@@ -273,6 +273,8 @@ void CHyprMasterLayout::applyNodeDataToWindow(SMasterNodeData* pNode) {
     }
 
     if (m_bForceWarps) {
+        g_pHyprRenderer->damageWindow(PWINDOW);
+
         PWINDOW->m_vRealPosition.warp();
         PWINDOW->m_vRealSize.warp();