diff --git a/src/cfgparse.y b/src/cfgparse.y
index fbbd5c0e..548d7482 100644
--- a/src/cfgparse.y
+++ b/src/cfgparse.y
@@ -276,7 +276,7 @@ word_or_number:
         ;
 
 mode:
-        TOKMODE WHITESPACE QUOTEDSTRING WHITESPACE '{' WHITESPACE modelines WHITESPACE '}'
+        TOKMODE WHITESPACE QUOTEDSTRING WHITESPACE '{' optional_whitespace modelines optional_whitespace '}'
         {
                 if (strcasecmp($<string>3, "default") == 0) {
                         printf("You cannot use the name \"default\" for your mode\n");
@@ -298,6 +298,11 @@ mode:
         }
         ;
 
+optional_whitespace:
+        /* empty */
+        | WHITESPACE
+        ;
+
 modelines:
         /* empty */
         | modelines WHITESPACE modeline