diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index 0952577e..8955ddc3 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -146,8 +146,8 @@ var Text = function(parentEl) {
                 var tabContent = spaceContent;
             }
 
-            this.$tabStrings[" "] = "<span class='" + className + "'>" + spaceContent + "</span>";
-            this.$tabStrings["\t"] = "<span class='" + className + "'>" + tabContent + "</span>";
+            this.$tabStrings[" "] = "<span class='" + className + " ace_invisible_space'>" + spaceContent + "</span>";
+            this.$tabStrings["\t"] = "<span class='" + className + " ace_invisible_tab'>" + tabContent + "</span>";
         }
     };
 
diff --git a/lib/ace/layer/text_test.js b/lib/ace/layer/text_test.js
index 1aa1cae5..57601207 100644
--- a/lib/ace/layer/text_test.js
+++ b/lib/ace/layer/text_test.js
@@ -108,13 +108,13 @@ module.exports = {
         ]);
         this.textLayer.setShowInvisibles(true);
         testRender([
-            "<span class='ace_indent-guide ace_invisible'>" + DOT(4) + "</span><span class='ace_invisible'>" + DOT(2) + "</span>" + EOL,
-            "<span class='ace_indent-guide ace_invisible'>" + TAB(4) + "</span><span class='ace_invisible'>" + TAB(4) + "</span><span class='ace_identifier'>f</span>" + EOL,
+            "<span class='ace_indent-guide ace_invisible ace_invisible_space'>" + DOT(4) + "</span><span class='ace_invisible ace_invisible_space'>" + DOT(2) + "</span>" + EOL,
+            "<span class='ace_indent-guide ace_invisible ace_invisible_tab'>" + TAB(4) + "</span><span class='ace_invisible ace_invisible_tab'>" + TAB(4) + "</span><span class='ace_identifier'>f</span>" + EOL,
         ]);
         this.textLayer.setDisplayIndentGuides(false);
         testRender([
-            "<span class='ace_invisible'>" + DOT(6) + "</span>" + EOL,
-            "<span class='ace_invisible'>" + TAB(4) + "</span><span class='ace_invisible'>" + TAB(4) + "</span><span class='ace_identifier'>f</span>" + EOL
+            "<span class='ace_invisible ace_invisible_space'>" + DOT(6) + "</span>" + EOL,
+            "<span class='ace_invisible ace_invisible_tab'>" + TAB(4) + "</span><span class='ace_invisible ace_invisible_tab'>" + TAB(4) + "</span><span class='ace_identifier'>f</span>" + EOL
         ]);
     }
 };