diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 7f8c47b..53b60ac 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -365,7 +365,7 @@ _zsh_highlight_highlighter_main_paint()
 # exit code is 0 if the braces_stack is empty, 1 otherwise.
 _zsh_highlight_main_highlighter_highlight_list()
 {
-  integer start_pos end_pos=0 buf_offset=$1 has_end=$3
+  integer start_pos end_pos=0 buf_offset=$1 has_end=$3 seen_dashdash=0
   # last_alias is the last alias arg (lhs) expanded (if in an alias).
   #     This allows for expanding alias ls='ls -l' while avoiding loops.
   local arg buf=$4 highlight_glob=true last_alias style
@@ -684,6 +684,7 @@ _zsh_highlight_main_highlighter_highlight_list()
 
    # The Great Fork: is this a command word?  Is this a non-command word?
    if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then
+     seen_dashdash=0
      if [[ $this_word == *':regular:'* ]]; then
        # This highlights empty commands (semicolon follows nothing) as an error.
        # Zsh accepts them, though.
@@ -990,9 +991,13 @@ _zsh_highlight_main_highlighter_highlight_argument()
 
   case "$arg[i]" in
     '-')
-      if (( option_eligible )); then
+      if (( option_eligible && ! seen_dashdash )); then
         if [[ $arg[i+1] == - ]]; then
-          base_style=double-hyphen-option
+          if [[ $#arg == 2 ]]; then
+            seen_dashdash=1
+          else
+            base_style=double-hyphen-option
+          fi
         else
           base_style=single-hyphen-option
         fi
diff --git a/highlighters/main/test-data/dashdash.zsh b/highlighters/main/test-data/dashdash.zsh
new file mode 100644
index 0000000..2f2e280
--- /dev/null
+++ b/highlighters/main/test-data/dashdash.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+touch -- -n
+
+BUFFER=$'cat -n -- -n | cat -n'
+
+expected_region_highlight=(
+  '1 3 command' # cat
+  '5 6 single-hyphen-option' # -n
+  '8 9 default' # --
+  '11 12 path' # -n
+  '14 14 commandseparator' # |
+  '16 18 command' # cat
+  '20 21 single-hyphen-option' # -n
+)