Merge branch 'master' into next

diff --git a/src/handlers.c b/src/handlers.c
index 1fb2bdd466014a464026704f91296a251b3bf8a8..688cf2f60d614f7d734e0100547c6bb1f9be544b 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -237,6 +237,7 @@ static void handle_enter_notify(xcb_enter_notify_event_t *event) {
     if (ws != con_get_workspace(focused))
         workspace_show(ws);
 
+    focused_id = XCB_NONE;
     con_focus(con_descend_focused(con));
     tree_render();