diff --git a/src/config.c b/src/config.c
index 7a0abba..a4c27f2 100644
--- a/src/config.c
+++ b/src/config.c
@@ -24,8 +24,8 @@ config_mouse_section(struct mbhead *mousebinds, struct conf_sec **sec)
      {
           m = xcalloc(1, sizeof(struct mousebind));
 
-          m->button   = fetch_opt_first(sec[i], "1", "button").num;
-          m->func     = uicb_name_func(fetch_opt_first(sec[i], "", "func").str);
+          m->button = fetch_opt_first(sec[i], "1", "button").num;
+          m->func   = uicb_name_func(fetch_opt_first(sec[i], "", "func").str);
 
           if((p = fetch_opt_first(sec[i], "", "cmd").str))
                m->cmd = xstrdup(p);
@@ -161,6 +161,11 @@ config_tag(void)
                     tag_new(s, name);
      }
 
+     /* If no tag at all on a screen, add one anyway */
+     SLIST_FOREACH(s, &W->h.screen, next)
+          if(TAILQ_EMPTY(&s->tags))
+               tag_new(s, "tag");
+
      free(ks);
 }
 
diff --git a/wmfsrc b/wmfsrc
index bd72f18..4dc3618 100644
--- a/wmfsrc
+++ b/wmfsrc
@@ -71,13 +71,18 @@
 
 [tags]
 
-  [tag] screen = 0 name = "1" [/tag]
-  [tag] screen = 0 name = "2" [/tag]
-  [tag] screen = 0 name = "3" [/tag]
-  [tag] screen = 0 name = "4" [/tag]
-  [tag] screen = 0 name = "5" [/tag]
-  [tag] screen = 0 name = "6" [/tag]
-  [tag] screen = 0 name = "7" [/tag]
+  # Use no screen option or screen = -1 to set tag on each screen
+  [tag]
+      screen = -1
+      name = "1"
+  [/tag]
+
+  [tag] name = "2" [/tag]
+  [tag] name = "3" [/tag]
+  [tag] name = "4" [/tag]
+  [tag] name = "5" [/tag]
+  [tag] name = "6" [/tag]
+  [tag] name = "7" [/tag]
 
   # Mousebinds associated to Tags element button
   [mouse] button = "1" func = "tag_click" [/mouse]