diff --git a/ChangeLog b/ChangeLog
index cbb28823..be877c32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *07/01/05:
+   * When a client in an unfocused tab creates a transient window, set that
+     client to the active tab (Mark)
+     Window.cc
    * Window wasn't staying focused when dragging across workspaces with
      outline window moving (Mark)
      Window.cc
diff --git a/src/Window.cc b/src/Window.cc
index b3b395b5..73efbab6 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1931,8 +1931,10 @@ void FluxboxWindow::raise() {
         m_client->transientFor()->transientList().push_back(m_client);
     }
     // raise this window and every transient in it with this one last
-    if (client->fbwindow())
+    if (client->fbwindow()) {
         raiseFluxboxWindow(*client->fbwindow());
+        client->fbwindow()->setCurrentClient(*client, false);
+    }
 
 }