diff --git a/src/app/token.coffee b/src/app/token.coffee
index e141dd7bf..657e6658b 100644
--- a/src/app/token.coffee
+++ b/src/app/token.coffee
@@ -72,13 +72,13 @@ class Token
 
     if invisibles
       if @isHardTab and invisibles.tab
-        html = html.replace(/^./, "<span class='invisible'>#{invisibles.tab}</span>")
+        html = html.replace(/^./, "<span class='invisible hard-tab'>#{invisibles.tab}</span>")
       else if invisibles.space
         if hasLeadingWhitespace
           html = html.replace /^[ ]+/, (match) ->
-            "<span class='invisible'>#{match.replace(/./g, invisibles.space)}</span>"
+            "<span class='invisible leading-whitespace'>#{match.replace(/./g, invisibles.space)}</span>"
         if hasTrailingWhitespace
           html = html.replace /[ ]+$/, (match) ->
-            "<span class='invisible'>#{match.replace(/./g, invisibles.space)}</span>"
+            "<span class='invisible trailing-whitespace'>#{match.replace(/./g, invisibles.space)}</span>"
 
     html