2 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 201a575..4a745e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *07/02/06:
+   * Wrong window was being raised when attaching an unfocused window (Mark)
+     Window.cc
    * Make selecting `close' from the workspace menu close the correct client,
      rather than the active tab in the window -- selecting `close' from right
      clicking on a tab is still wrong, as there are complications (Mark)
diff --git a/src/Window.cc b/src/Window.cc
index c505edc..56b1e09 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -676,6 +676,10 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
         FocusControl::setFocusedWindow(&client);
     } else if (focused_win)
         setCurrentClient(*focused_win, false);
+    else
+        // reparenting puts the new client on top, but the old client is keeping
+        // the focus, so we raise it
+        m_client->raise();
 
     frame().reconfigure();
 }