diff --git a/src/shell/element/surface.rs b/src/shell/element/surface.rs
index f715bba3..c976b38b 100644
--- a/src/shell/element/surface.rs
+++ b/src/shell/element/surface.rs
@@ -238,7 +238,8 @@ impl CosmicSurface {
                 toplevel.with_pending_state(|state| state.size = Some(geo.size.as_logical()))
             }
             WindowSurface::X11(surface) => {
-                let _ = surface.configure_with_sync(geo.as_logical(), None);
+                let _ =
+                    surface.configure_with_sync(geo.as_logical() + surface.frame_extents(), None);
             }
         }
     }
diff --git a/src/shell/layout/floating/grabs/resize.rs b/src/shell/layout/floating/grabs/resize.rs
index 04363207..a1e63eac 100644
--- a/src/shell/layout/floating/grabs/resize.rs
+++ b/src/shell/layout/floating/grabs/resize.rs
@@ -543,7 +543,7 @@ impl ResizeSurfaceGrab {
                             );
                         }
                         WindowSurface::X11(surface) => {
-                            let mut geometry = surface.geometry();
+                            let mut geometry = surface.last_configure();
                             geometry.loc += (location - new_location).as_logical();
                             let _ = surface.configure(geometry);
                         }