diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index cf9195b08..b574cd0a7 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -64,6 +64,7 @@ Fixed
   primary selection
 - Don't display quit confirmation with finished downloads
 - Fixed updating the tab index in the statusbar when opening a background tab
+- Fixed a crash when entering `:-- ` in the commandline
 
 v0.6.2
 ------
diff --git a/README.asciidoc b/README.asciidoc
index 95b6b8271..f5a1bc492 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -179,6 +179,7 @@ Contributors, sorted by the number of commits in descending order:
 * rikn00
 * kanikaa1234
 * haitaka
+* Nick Ginther
 * Michael Ilsaas
 * Martin Zimmermann
 * Brian Jackson
@@ -194,7 +195,6 @@ Contributors, sorted by the number of commits in descending order:
 * Ismail
 * Samir Benmendil
 * Regina Hug
-* Nick Ginther
 * Mathias Fussenegger
 * Marcelo Santos
 * Jan Verbeek
diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index ffc4db3a0..2f2823611 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -204,6 +204,8 @@ class Completer(QObject):
         parts, cursor_part = self._filter_cmdline_parts(parts, cursor_part)
         log.completion.debug("After filtering flags: parts {}, cursor_part "
                              "{}".format(parts, cursor_part))
+        if not parts:
+            return None
         if cursor_part == 0:
             # '|' or 'set|'
             model = instances.get(usertypes.Completion.command)
diff --git a/tests/integration/features/misc.feature b/tests/integration/features/misc.feature
index 372bcf48a..84ee7fcc3 100644
--- a/tests/integration/features/misc.feature
+++ b/tests/integration/features/misc.feature
@@ -431,3 +431,9 @@ Feature: Various utility commands.
         Given I have a fresh instance
         When I run :messages
         Then the page should contain the plaintext "No messages to show."
+
+    ## https://github.com/The-Compiler/qutebrowser/issues/1523
+
+    Scenario: Completing a single option argument
+        When I run :set-cmd-text -s :-- 
+        Then no crash should happen