diff --git a/src/client.c b/src/client.c
index 3450f54..bea7ea8 100644
--- a/src/client.c
+++ b/src/client.c
@@ -160,7 +160,7 @@ client_gb_titlebar(Window w)
      if(!c->titlebar)
           return NULL;
 
-     while(c && c->titlebar->win != w)
+     while(c)
      {
           if(c->titlebar->win == w)
                return c;
diff --git a/src/wmfs.h b/src/wmfs.h
index ab3e38c..34511fb 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -114,7 +114,7 @@ struct status_ctx
 {
      struct barwin *barwin;
      struct theme *theme;
-#define STATUS_BLOCK_REFRESH 0x01
+#define STATUS_BLOCK_REFRESH  0x01
      Flags flags;
      char *status;
      bool update;