diff --git a/src/Controls.js b/src/Controls.js
index fe9bfb702..fe613db5b 100644
--- a/src/Controls.js
+++ b/src/Controls.js
@@ -405,7 +405,9 @@ function bindElements(insertHandler) {
  */
 function activate(id, insertHandler) {
     $("#" + id).addClass("is-active");
-    insertHandler.insertActive(id);
+    if (document.getElementById(id).classList.contains("insertel")) {
+        insertHandler.insertActive(id);
+    }
 }
 
 /**
diff --git a/src/InsertHandler.js b/src/InsertHandler.js
index e1655aeeb..0a0a02af2 100644
--- a/src/InsertHandler.js
+++ b/src/InsertHandler.js
@@ -136,10 +136,9 @@ function InsertHandler (neonView) {
             editModeButton.innerHTML = "Return to Edit Mode";
             editModeContainer.appendChild(editModeButton);
             document.getElementById("delete").parentNode.parentNode.appendChild(editModeContainer);
+            editModeButton.addEventListener("click", insertDisabled);
         }
 
-        editModeButton.addEventListener("click", insertDisabled);
-
         Notification.queueNotification("Insert Mode");
     }
 
diff --git a/src/Select.js b/src/Select.js
index cfd2274e4..38f1366b6 100644
--- a/src/Select.js
+++ b/src/Select.js
@@ -22,7 +22,7 @@ export function ClickSelect (dragHandler, zoomHandler, neonView, neon, infoBox)
 
     //Selection mode toggle
     function selectListeners () {
-        var classesToSelect = "use, #svg_group";
+        var classesToSelect = "#svg_group use, #svg_group";
         Controls.initSelectionButtons();
 
         //Activating selected neumes
@@ -217,9 +217,9 @@ export function DragSelect (dragHandler, zoomHandler, neonView, neon, infoBox) {
 
             var nc;
             if ($("#selByStaff").hasClass("is-active")) {
-                nc = d3.selectAll("use, .staff")._groups[0];
+                nc = d3.selectAll("#svg_group use, .staff")._groups[0];
             } else {
-                nc = d3.selectAll("use")._groups[0];
+                nc = d3.selectAll("#svg_group use")._groups[0];
             }
             var els = Array.from(nc);