diff --git a/src/Library/RuleParser/Grammar.hpp b/src/Library/RuleParser/Grammar.hpp
index aebb7277..d94a55c1 100644
--- a/src/Library/RuleParser/Grammar.hpp
+++ b/src/Library/RuleParser/Grammar.hpp
@@ -214,13 +214,14 @@ namespace usbguard
       : seq<target,
         opt<plus<ascii::blank>, device_id>,
         opt<plus<ascii::blank>, list<rule_attributes, plus<ascii::blank>>>,
-        opt<comment>> {};
+        opt<comment>,
+        star<ascii::blank>> {};
 
     /*
      * Grammar entry point
      */
     struct rule_grammar
-      : until<eof, must<sor<comment, rule>>> {};
+      : seq<star<ascii::blank>, opt<sor<comment, rule>>, must<eof>> {};
   } /* namespace RuleParser */
 } /* namespace usbguard */
 
diff --git a/src/Tests/Rules/test-rules.file b/src/Tests/Rules/test-rules.file
index 45f18a1e..f0fefc88 100644
--- a/src/Tests/Rules/test-rules.file
+++ b/src/Tests/Rules/test-rules.file
@@ -9,3 +9,6 @@ reject with-interface one-of { e5:*:* 2A:*:* AC:c7:* 4B:*:* f2:*:* }  if equals-
 
 reject with-interface one-of { e6:*:* } # comment about this rule
  # reject with-interface one-of { e6:*:* }
+
+# Ignore whitespace around rule
+ reject with-interface one-of { e6:*:* }