diff --git a/event.h b/event.h
index 5849f7324..47ea42878 100644
--- a/event.h
+++ b/event.h
@@ -35,8 +35,8 @@ void luaA_emit_refresh(void);
 void drawin_refresh(void);
 
 /* objects/client.c */
+void client_refresh(void);
 void client_focus_refresh(void);
-void client_border_refresh(void);
 
 /* objects/screen.c */
 void screen_refresh(void);
@@ -49,8 +49,7 @@ awesome_refresh(void)
     banning_refresh();
     stack_refresh();
     drawin_refresh();
-    client_border_refresh();
-    client_focus_refresh();
+    client_refresh();
     return xcb_flush(globalconf.connection);
 }
 
diff --git a/objects/client.c b/objects/client.c
index 057b76ee3..845e6e1fe 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -1128,13 +1128,20 @@ client_focus_refresh(void)
                         win, globalconf.timestamp);
 }
 
-void
+static void
 client_border_refresh(void)
 {
     foreach(c, globalconf.clients)
         window_border_refresh((window_t *) *c);
 }
 
+void
+client_refresh(void)
+{
+    client_border_refresh();
+    client_focus_refresh();
+}
+
 static void
 border_width_callback(client_t *c, uint16_t old_width, uint16_t new_width)
 {