diff --git a/wayfire/lexer/lexer.cpp b/wayfire/lexer/lexer.cpp
index 116259f..d63e805 100644
--- a/wayfire/lexer/lexer.cpp
+++ b/wayfire/lexer/lexer.cpp
@@ -53,14 +53,14 @@ symbol_t lexer_t::parse_symbol()
     }
     else
     {
-        if (_parse_position >= _size)
+        while ((_parse_position < _size) && std::isspace(_text.at(_parse_position)))
         {
-            return symbol_t(symbol_t::type_t::END);
+            ++_parse_position;
         }
 
-        while (std::isspace(_text.at(_parse_position)))
+        if (_parse_position >= _size)
         {
-            ++_parse_position;
+            return symbol_t(symbol_t::type_t::END);
         }
 
         _symbol_position = _parse_position;