2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index aae3c65..a6125eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *07/03/10:
+   * Autogrouped windows weren't getting added to the workspace menu (Mark)
+     Screen.cc
    * Changed default toolbar layer to DOCK, as a large window could render
      fluxbox useless to a new user otherwise (Mark)
      Toolbar.cc doc/asciidoc/fluxbox.txt
diff --git a/src/Screen.cc b/src/Screen.cc
index f399717..44171be 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1449,9 +1449,12 @@ FluxboxWindow *BScreen::createWindow(Window client) {
     } else {
 
         Fluxbox::instance()->attachSignals(*winclient);
-        if (winclient->fbwindow()) // may have been set in an atomhandler
+        if (winclient->fbwindow()) { // may have been set in an atomhandler
             win = winclient->fbwindow();
-        else {
+            Workspace *workspace = getWorkspace(win->workspaceNumber());
+            if (workspace)
+                workspace->updateClientmenu();
+        } else {
             win = new FluxboxWindow(*winclient,
                                     winFrameTheme(),
                                     *layerManager().getLayer(Layer::NORMAL));