1 files changed, 4 insertions, 4 deletions

diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index cdc46cf..60615a4 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -505,13 +505,13 @@ void FocusControl::unfocusWindow(WinClient &client,
 
     BScreen &screen = fbwin->screen();
 
+    if (client.isTransient() && client.transientFor()->focus())
+        return;
+
     if (!unfocus_frame) {
         WinClient *last_focus = screen.focusControl().lastFocusedWindow(*fbwin, &client);
-        if (last_focus != 0 &&
-            fbwin->setCurrentClient(*last_focus, 
-                                    s_focused_window == &client)) {
+        if (last_focus && last_focus->focus())
             return;
-        }
     }
 
     if (full_revert && s_focused_window == &client)