diff --git a/src/dom-elements-pool.coffee b/src/dom-elements-pool.coffee
index 482eb8417..04a037ef4 100644
--- a/src/dom-elements-pool.coffee
+++ b/src/dom-elements-pool.coffee
@@ -19,7 +19,7 @@ class DomElementsPool
     @freeElementsByTagName[element.tagName.toLowerCase()].push(element)
 
   freeElementAndDescendants: (element) ->
+    @free(element)
+
     for child in toArray(element.children)
       @freeElementAndDescendants(child)
-
-    @free(element)
diff --git a/src/line-numbers-tile-component.coffee b/src/line-numbers-tile-component.coffee
index ed08e3727..1d8b37f19 100644
--- a/src/line-numbers-tile-component.coffee
+++ b/src/line-numbers-tile-component.coffee
@@ -114,10 +114,10 @@ class LineNumbersTileComponent
     else
       lineNumber = (bufferRow + 1).toString()
 
-    padding = _.multiplyString(' ', maxLineNumberDigits - lineNumber.length)
+    padding = _.multiplyString("\u00a0", maxLineNumberDigits - lineNumber.length)
     iconRight = @elementsPool.build("div", "icon-right")
 
-    lineNumberNode.innerHTML = padding + lineNumber
+    lineNumberNode.innerText = padding + lineNumber
     lineNumberNode.appendChild(iconRight)
 
   updateLineNumberNode: (lineNumberId, newLineNumberState) ->
diff --git a/src/lines-tile-component.coffee b/src/lines-tile-component.coffee
index da653d279..3492f9dac 100644
--- a/src/lines-tile-component.coffee
+++ b/src/lines-tile-component.coffee
@@ -143,7 +143,6 @@ class LinesTileComponent
 
     if indentGuidesVisible and indentLevel > 0
       invisibleIndex = 0
-      lineHTML = ''
       for i in [0...indentLevel]
         indentGuide = @elementsPool.build("span", "indent-guide")
         for j in [0...tabLength]
@@ -162,14 +161,13 @@ class LinesTileComponent
         )
     else
       unless @appendEndOfLineNodes(id, lineNode)
-        lineNode.insertAdjacentHTML("beforeend", " ")
+        lineNode.insertAdjacentText("beforeend", "\u00a0")
 
   appendLineInnerNodes: (id, lineNode) ->
     lineState = @newTileState.lines[id]
     {firstNonWhitespaceIndex, firstTrailingWhitespaceIndex, invisibles} = lineState
     lineIsWhitespaceOnly = firstTrailingWhitespaceIndex is 0
 
-    innerHTML = ""
     @tokenIterator.reset(lineState)
     openScopeNode = lineNode