diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index e4069659..bb8d733d 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -395,9 +395,9 @@ var Text = function(parentEl) {
             if (a) {
                 return new Array(c.length+1).join(" ");
             } else if (c == "&") {
-                return useragent.isOldGecko ? "&" : "&";
+                return "&";
             } else if (c == "<") {
-                return "&lt;";
+                return "&#60;";
             } else if (c == "\t") {
                 var tabSize = self.session.getScreenTabSize(screenColumn + tabIdx);
                 screenColumn += tabSize - 1;
@@ -411,10 +411,7 @@ var Text = function(parentEl) {
                     (self.config.characterWidth * 2) +
                     "px'>" + space + "</span>";
             } else if (b) {
-                if (self.showInvisibles)
-                    return "<span class='ace_invisible ace_invalid'>" + self.SPACE_CHAR + "</span>";
-                else
-                    return "&#160;";
+                return "<span class='ace_invisible ace_invalid'>" + self.SPACE_CHAR + "</span>";
             } else {
                 screenColumn += 1;
                 return "<span class='ace_cjk' style='width:" +