diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index 4c6a9d7df..545c2a36c 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -321,7 +321,7 @@ class Command:
             args.append(short_flag)
             self.opt_args[param.name] = long_flag, short_flag
             if typ is not bool:
-                self.flags_with_args.append(param.name)
+                self.flags_with_args += [short_flag, long_flag]
         else:
             args.append(name)
             self.pos_args.append((param.name, name))
diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 138f2b8b2..754bdb81c 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -292,7 +292,7 @@ class CommandRunner(QObject):
             for i, arg in enumerate(split_args):
                 arg = arg.strip()
                 if arg.startswith('-'):
-                    if arg.lstrip('-') in cmd.flags_with_args:
+                    if arg in cmd.flags_with_args:
                         flag_arg_count += 1
                 else:
                     maxsplit = i + cmd.maxsplit + flag_arg_count