diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index fa495c7..657fcd3 100755
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -104,6 +104,27 @@ _zsh_highlight_main_highlighter()
     [[ $start_pos -eq 0 && $arg = 'noglob' ]] && highlight_glob=false
     ((start_pos+=${#buf[$start_pos+1,-1]}-${#${buf[$start_pos+1,-1]##([[:space:]]|\\[[:space:]])#}}))
     ((end_pos=$start_pos+${#arg}))
+
+    # Deal with faked colons.
+    #
+    # We can't use the (Z+n+) flag because that elides the end-of-command
+    # token altogether, so 'echo foo\necho bar' (two commands) becomes
+    # indistinguishable from 'echo foo echo bar' (one command with three
+    # words for arguments).
+    if [[ $arg == ';' ]] ; then
+      if [[ $buf[start_pos+1] == ';' ]] ; then
+        # Literally-input colon. That's the normal case.
+      elif [[ $buf[start_pos] == $'\n' ]] ; then
+        # Newline token rendered as a colon.  Empirically we're off-by-one.
+        (( start_pos -= 1 ))
+        (( end_pos -= 1 ))
+      else
+        # Currently, there aren't any other sources of ";" (SEPER) tokens
+        # besides literally-input semicolons and (Z+n+)-converted newlines,
+        # If that ever changes, handle them here.
+      fi
+    fi
+
     # Parse the sudo command line
     if $sudo; then
       case "$arg" in
diff --git a/highlighters/main/test-data/vanilla-newline.zsh b/highlighters/main/test-data/vanilla-newline.zsh
new file mode 100644
index 0000000..b876928
--- /dev/null
+++ b/highlighters/main/test-data/vanilla-newline.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 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
+# -------------------------------------------------------------------------------------------------
+
+PREBUFFER=$'echo foo; echo bar\n\n\n'
+BUFFER='echo baz; echo qux'
+
+expected_region_highlight=(
+  "0 4 $ZSH_HIGHLIGHT_STYLES[builtin]" # echo
+  "5 7 $ZSH_HIGHLIGHT_STYLES[default]" # baz
+  "8 9 $ZSH_HIGHLIGHT_STYLES[default]" # semicolon
+  "11 14 $ZSH_HIGHLIGHT_STYLES[builtin]" # echo
+  "16 18 $ZSH_HIGHLIGHT_STYLES[default]" # qux
+)