diff --git a/openbox/event.c b/openbox/event.c
index 5c9dc407..1d19a284 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -618,7 +618,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                  e->xfocus.window, client->window,
                  e->xfocus.mode, e->xfocus.detail);
 #endif
-        if (focus_hilite == client)
+        if (focus_hilite == client || focus_client == client)
             focus_out = client;
         if (focus_in == client)
             focus_in = NULL;