diff --git a/web/debugger.js b/web/debugger.js
index 4cbee4a79..501daa84c 100644
--- a/web/debugger.js
+++ b/web/debugger.js
@@ -21,30 +21,26 @@ var FontInspector = (function FontInspectorClosure() {
   var active = false;
   var fontAttribute = 'data-font-name';
   function removeSelection() {
-    var divs = document.querySelectorAll('div[' + fontAttribute + ']');
-    for (var i = 0, ii = divs.length; i < ii; ++i) {
-      var div = divs[i];
+    let divs = document.querySelectorAll(`span[${fontAttribute}]`);
+    for (let div of divs) {
       div.className = '';
     }
   }
   function resetSelection() {
-    var divs = document.querySelectorAll('div[' + fontAttribute + ']');
-    for (var i = 0, ii = divs.length; i < ii; ++i) {
-      var div = divs[i];
+    let divs = document.querySelectorAll(`span[${fontAttribute}]`);
+    for (let div of divs) {
       div.className = 'debuggerHideText';
     }
   }
   function selectFont(fontName, show) {
-    var divs = document.querySelectorAll('div[' + fontAttribute + '=' +
-                                         fontName + ']');
-    for (var i = 0, ii = divs.length; i < ii; ++i) {
-      var div = divs[i];
+    let divs = document.querySelectorAll(`span[${fontAttribute}=${fontName}]`);
+    for (let div of divs) {
       div.className = show ? 'debuggerShowText' : 'debuggerHideText';
     }
   }
   function textLayerClick(e) {
     if (!e.target.dataset.fontName ||
-        e.target.tagName.toUpperCase() !== 'DIV') {
+        e.target.tagName.toUpperCase() !== 'SPAN') {
       return;
     }
     var fontName = e.target.dataset.fontName;