diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index f466cafb70..bbe6faad4c 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -359,7 +359,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
           int n_children = 0;
 
           if (tokens[i] == NULL)
-            continue;
+            break;
 
           t = g_strsplit (tokens[i], ",", -1);