diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index cc293fcbd..8b30851fd 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -844,7 +844,7 @@ class DisplayBuffer extends Model
         column = @screenLines[row].clipScreenColumn(0)
       else
         column = screenLine.clipScreenColumn(maxScreenColumn - 1)
-    else if screenLine.tokens[0].isPhantom and column < screenLine.tokens[0].screenDelta
+    else if screenLine.isInsidePhantomToken(column)
       row--
       column = @screenLines[row].getMaxScreenColumn()
     else if wrapBeyondNewlines and column > maxScreenColumn and row < @getLastRow()
diff --git a/src/tokenized-line.coffee b/src/tokenized-line.coffee
index 3bf9407b3..446556e0e 100644
--- a/src/tokenized-line.coffee
+++ b/src/tokenized-line.coffee
@@ -125,7 +125,10 @@ class TokenizedLine
     @lineEnding is null
 
   isOutsidePhantomToken: (column) ->
-    !@tokens[0].isPhantom || column > @tokens[0].screenDelta
+    @tokens[0].isPhantom && column > @tokens[0].screenDelta
+
+  isInsidePhantomToken: (column) ->
+    @tokens[0].isPhantom && column < @tokens[0].screenDelta
 
   tokenAtBufferColumn: (bufferColumn) ->
     @tokens[@tokenIndexAtBufferColumn(bufferColumn)]