diff --git a/TODO b/TODO
index 9066f9e5..5888fa93 100644
--- a/TODO
+++ b/TODO
@@ -110,7 +110,6 @@ miscellaneous:
     - use 1 token for logins, so that session isn't killed
     - endless pager should include information about page number
     - add hotkeys for focusing items in top navigation
-    - add ability to select tags text in tag input
     - add customizable favicon
     - add customizable logo
     - add log engine and log everything that should be logged
diff --git a/public_html/js/Controls/TagInput.js b/public_html/js/Controls/TagInput.js
index 62259645..d2c8bd52 100644
--- a/public_html/js/Controls/TagInput.js
+++ b/public_html/js/Controls/TagInput.js
@@ -40,6 +40,9 @@ App.Controls.TagInput = function(
 	$wrapper.append($input);
 	$wrapper.insertAfter($underlyingInput);
 	$wrapper.click(function(e) {
+		if (e.target.nodeName === 'LI') {
+			return;
+		}
 		e.preventDefault();
 		$input.focus();
 	});