diff --git a/src/client.c b/src/client.c
index 643a6cc..3221322 100644
--- a/src/client.c
+++ b/src/client.c
@@ -626,6 +626,8 @@ client_focus(struct client *c)
           }
 
           XSetInputFocus(W->dpy, c->win, RevertToPointerRoot, CurrentTime);
+          XChangeProperty(W->dpy, W->root, W->net_atom[net_active_window], XA_WINDOW, 32,
+                          PropModeReplace, (unsigned char *)&c->win, 1);
      }
      else
      {
diff --git a/src/ewmh.c b/src/ewmh.c
index 3e9823a..4e2e1ae 100644
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -134,8 +134,6 @@ ewmh_get_client_list(void)
                      PropModeReplace, (unsigned char *)list, win_n);
 
      XFree(list);
-
-     return;
 }
 
 /*