diff --git a/qutebrowser/commands/managers.py b/qutebrowser/commands/managers.py
index c8f93a38c..ddb9836f4 100644
--- a/qutebrowser/commands/managers.py
+++ b/qutebrowser/commands/managers.py
@@ -175,7 +175,8 @@ class CommandManager:
         self._cmd = cmd
         self._args = args
         retargs = args[:]
-        if text.endswith(' ') and len(args) <= cmd.maxsplit:
+        if text.endswith(' ') and (cmd.maxsplit == -1 or
+                                   len(args) <= cmd.maxsplit):
             retargs.append('')
         return [cmdstr] + retargs