diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index 23559773..f131efa4 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -653,8 +653,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
         g_pInputManager->simulateMouseMovement();
 
     // fix some xwayland apps that don't behave nicely
-    PWINDOW->m_vPendingReportedSize = PWINDOW->m_vRealSize.goalv();
-    PWINDOW->m_vReportedSize        = PWINDOW->m_vPendingReportedSize;
+    PWINDOW->m_vReportedSize = PWINDOW->m_vPendingReportedSize;
 }
 
 void Events::listener_unmapWindow(void* owner, void* data) {
diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp
index f9f8ab59..22816716 100644
--- a/src/layout/IHyprLayout.cpp
+++ b/src/layout/IHyprLayout.cpp
@@ -162,7 +162,8 @@ void IHyprLayout::onWindowCreatedFloating(CWindow* pWindow) {
         g_pXWaylandManager->setWindowSize(pWindow, pWindow->m_vRealSize.goalv());
 
         g_pCompositor->changeWindowZOrder(pWindow, true);
-    }
+    } else
+        pWindow->m_vPendingReportedSize = pWindow->m_vRealSize.goalv();
 }
 
 void IHyprLayout::onBeginDragWindow() {