diff --git a/src/editor-view.coffee b/src/editor-view.coffee
index 45be2e1c4..b3467230f 100644
--- a/src/editor-view.coffee
+++ b/src/editor-view.coffee
@@ -1487,7 +1487,7 @@ class EditorView extends View
       position = 0
       for token in tokens
         @updateScopeStack(line, scopeStack, token.scopes)
-        hasIndentGuide = not mini and showIndentGuide and lineIsWhitespaceOnly
+        hasIndentGuide = not mini and showIndentGuide and token.hasLeadingWhitespace or (token.hasTrailingWhitespace and lineIsWhitespaceOnly)
         line.push(token.getValueAsHtml({invisibles, hasIndentGuide}))
         position += token.value.length