diff --git a/ChangeLog b/ChangeLog
index 40cc51ca..665cc270 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.16:
+*06/04/26:
+   * Fix resizing of client window when autogroup from apps (Simon)
+     Window.cc
 *06/04/25:
    * Cleanup unneeded headers (thanks Semushin Slava)
      FbAtoms.cc Slit.cc Keys.cc FocusControl.cc FbTk/App.cc
diff --git a/src/Window.cc b/src/Window.cc
index 31f43741..80092484 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -678,6 +678,12 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
     } else { // client.fbwindow() == 0
         associateClient(client);
 
+        moveResizeClient(client,
+                         frame().clientArea().x(),
+                         frame().clientArea().y(),
+                         frame().clientArea().width(),
+                         frame().clientArea().height());
+
         if (&client == focused_win)
             was_focused = focused_win;