diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index 9fea3c2bf..06bee4a34 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -841,10 +841,7 @@ class DisplayBuffer extends Model
     if screenLine.isSoftWrapped() and column >= maxScreenColumn
       if wrapAtSoftNewlines
         row++
-        column = if @screenLines[row].tokens[0].isPhantom
-                   @screenLines[row].tokens[0].screenDelta
-                 else
-                   0
+        column = @screenLines[row].clipScreenColumn(0)
       else
         column = screenLine.clipScreenColumn(maxScreenColumn - 1)
     else if screenLine.tokens[0].isPhantom and column < screenLine.tokens[0].screenDelta
diff --git a/src/tokenized-line.coffee b/src/tokenized-line.coffee
index b09e39e68..b8156967f 100644
--- a/src/tokenized-line.coffee
+++ b/src/tokenized-line.coffee
@@ -48,7 +48,9 @@ class TokenizedLine
       break if tokenStartColumn + token.screenDelta > column
       tokenStartColumn += token.screenDelta
 
-    if token.isAtomic and tokenStartColumn < column
+    if token.isPhantom and tokenStartColumn <= column
+      tokenStartColumn + token.screenDelta
+    else if token.isAtomic and tokenStartColumn < column
       if skipAtomicTokens
         tokenStartColumn + token.screenDelta
       else