diff --git a/Grid.js b/Grid.js
index 2c8e1a6..6249868 100644
--- a/Grid.js
+++ b/Grid.js
@@ -158,7 +158,11 @@ class Grid {
 
     elem.addEventListener('click', () => {
       let editorElem = document.getElementById(id);
+      if (!editorElem) {
+        return;
+      }
       editorElem.xArchObj.toggleHighlight();
+      editorElem.focus();
     });
   }