diff --git a/src/bowtieView.ts b/src/bowtieView.ts
index f13a707..b3c35aa 100644
--- a/src/bowtieView.ts
+++ b/src/bowtieView.ts
@@ -801,7 +801,8 @@ export class BowtieView extends TextFileView {
 		wrap.setAttribute("aria-pressed", this.isNodeSelected(node.ref) ? "true" : "false");
 
 		wrap.addEventListener("click", (e) => {
-			if ((e.target as HTMLElement).closest("button, [role='button']")) return;
+			const target = e.target as HTMLElement;
+			if (target.closest("button")) return;
 			e.stopPropagation();
 			this.selectNodeElement(node.ref, wrap);
 		});
diff --git a/styles.css b/styles.css
index 8093727..2e3a01e 100644
--- a/styles.css
+++ b/styles.css
@@ -375,7 +375,12 @@
 	box-sizing: border-box;
 }
 
-.o-tie-controls-overlay > .o-tie-overlay-hidden {
+.o-tie-controls-overlay .o-tie-node-delete.o-tie-overlay-hidden,
+.o-tie-controls-overlay .o-tie-node-add-barrier.o-tie-overlay-hidden,
+.o-tie-controls-overlay .o-tie-node-add-escalation.o-tie-overlay-hidden,
+.o-tie-controls-overlay .o-tie-node-add-esc-barrier.o-tie-overlay-hidden,
+.o-tie-controls-overlay .o-tie-stack-add.o-tie-overlay-hidden,
+.o-tie-controls-overlay .o-tie-lane-add.o-tie-overlay-hidden {
 	display: none;
 }