diff --git a/layout.html b/layout.html
index ecddfbd..88fd574 100755
--- a/layout.html
+++ b/layout.html
@@ -966,23 +966,21 @@
 			}
 
 			const block_tag_editor_handlers = () => {
-				const enabled_tags = document.querySelectorAll(".tag.enabled");
-				const disabled_tags = document.querySelectorAll(".tag.disabled");
+				const tags = document.querySelectorAll("#new_block_program_tags > .tag");
+				tags.forEach((tag) => {
+					tag.addEventListener("click", block_tag_editor_click_handler);
+				});
+			}
 
-				enabled_tags.forEach((tag) => {
-					tag.addEventListener("click", (e) => {
-						e.preventDefault();
-						e.target.classList.remove('enabled');
-						e.target.classList.add('disabled');
-					});
-				});
-				disabled_tags.forEach((tag) => {
-					tag.addEventListener("click", (e) => {
-						e.preventDefault();
-						e.target.classList.remove('disabled');
-						e.target.classList.add('enabled');
-					});
-				});
+			const block_tag_editor_click_handler = (e) => {
+				e.preventDefault();
+				if (e.target.classList.contains('disabled')) {
+					e.target.classList.remove('disabled');
+					e.target.classList.add('enabled');
+				} else {
+					e.target.classList.remove('enabled');
+					e.target.classList.add('disabled');
+				}
 			}
 
 			document.getElementById("epg_tab").addEventListener("click", (e) => {