diff --git a/awesomerc b/awesomerc
index 6f2b3ea24..4668d4b90 100644
--- a/awesomerc
+++ b/awesomerc
@@ -26,45 +26,44 @@ screen 0
     {
         position = "top"
     }
-}
-
-tags
-{
-    tag 1
+    tags
     {
-        layout = "tile"
-    }
-    tag 2
-    {
-        layout = "tile"
-    }
-    tag 3
-    {
-        layout = "tile"
-    }
-    tag 4
-    {
-        layout = "tile"
-    }
-    tag 5
-    {
-        layout = "tile"
-    }
-    tag 6
-    {
-        layout = "tile"
-    }
-    tag 7
-    {
-        layout = "tile"
-    }
-    tag 8
-    {
-        layout = "tile"
-    }
-    tag 9
-    {
-        layout = "floating"
+        tag 1
+        {
+            layout = "tile"
+        }
+        tag 2
+        {
+            layout = "tile"
+        }
+        tag 3
+        {
+            layout = "tile"
+        }
+        tag 4
+        {
+            layout = "tile"
+        }
+        tag 5
+        {
+            layout = "tile"
+        }
+        tag 6
+        {
+            layout = "tile"
+        }
+        tag 7
+        {
+            layout = "tile"
+        }
+        tag 8
+        {
+            layout = "tile"
+        }
+        tag 9
+        {
+            layout = "floating"
+        }
     }
 }
 
diff --git a/config.c b/config.c
index 2b067cb0c..b4f633bb5 100644
--- a/config.c
+++ b/config.c
@@ -198,6 +198,7 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
     static cfg_opt_t screen_opts[] =
     {
         CFG_SEC((char *) "statusbar", statusbar_opts, CFGF_NONE),
+        CFG_SEC((char *) "tags", tags_opts, CFGF_NONE),
     };
     static cfg_opt_t rule_opts[] =
     {
@@ -230,7 +231,6 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
         CFG_SEC((char *) "general", general_opts, CFGF_NONE),
         CFG_SEC((char *) "colors", colors_opts, CFGF_NONE),
         CFG_SEC((char *) "screen", screen_opts, CFGF_TITLE | CFGF_MULTI),
-        CFG_SEC((char *) "tags", tags_opts, CFGF_NONE),
         CFG_SEC((char *) "layouts", layouts_opts, CFGF_NONE),
         CFG_SEC((char *) "rules", rules_opts, CFGF_NONE),
         CFG_SEC((char *) "keys", keys_opts, CFGF_NONE),
@@ -279,11 +279,11 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
 
     /* get screen specific sections */
     cfg_statusbar = cfg_getsec(cfg_screen, "statusbar");
+    cfg_tags = cfg_getsec(cfg_screen, "tags");
 
     /* get general sections */
     cfg_general = cfg_getsec(cfg, "general");
     cfg_colors = cfg_getsec(cfg, "colors");
-    cfg_tags = cfg_getsec(cfg, "tags");
     cfg_layouts = cfg_getsec(cfg, "layouts");
     cfg_rules = cfg_getsec(cfg, "rules");
     cfg_keys = cfg_getsec(cfg, "keys");