diff --git a/src/x11window.cpp b/src/x11window.cpp
index dbf8c66252..c45c960b78 100644
--- a/src/x11window.cpp
+++ b/src/x11window.cpp
@@ -604,13 +604,9 @@ bool X11Window::manage(xcb_window_t w, bool isMapped)
         setOnActivities(activitiesList);
     }
 
-    QRectF geom = windowGeometry.rect();
+    QRectF geom = session ? session->geometry : windowGeometry.rect();
     bool placementDone = false;
 
-    if (session) {
-        geom = session->geometry;
-    }
-
     QRectF area;
     bool partial_keep_in_area = isMapped || session;
     if (isMapped || session) {