diff --git a/public_html/css/forms.css b/public_html/css/forms.css
index 0a02db99..247dbcaa 100644
--- a/public_html/css/forms.css
+++ b/public_html/css/forms.css
@@ -74,8 +74,12 @@ input[type=button]:not(:disabled):hover.highlight {
 	background: #dfa;
 }
 
-textarea:focus, input:focus{
+textarea:focus, input:focus {
 	outline: none;
+}
+.tag-input.focused,
+textarea:focus,
+input:not(.tag-real-input):focus {
 	box-shadow: 0 0 0 1px #5da inset;
 	border-color: #5da;
 }
diff --git a/public_html/js/Controls/TagInput.js b/public_html/js/Controls/TagInput.js
index 3ad09284..44ff45f7 100644
--- a/public_html/js/Controls/TagInput.js
+++ b/public_html/js/Controls/TagInput.js
@@ -30,7 +30,7 @@ App.Controls.TagInput = function(
 
 	var $wrapper = jQuery('<div class="tag-input">');
 	var $tagList = jQuery('<ul class="tags">');
-	var $input = jQuery('<input type="text"/>');
+	var $input = jQuery('<input class="tag-real-input" type="text"/>');
 	$wrapper.append($tagList);
 	$wrapper.append($input);
 	$wrapper.insertAfter($underlyingInput);
@@ -40,6 +40,13 @@ App.Controls.TagInput = function(
 	});
 	$input.attr('placeholder', $underlyingInput.attr('placeholder'));
 
+	$input.unbind('focus').bind('focus', function(e) {
+		$wrapper.addClass('focused');
+	});
+	$input.unbind('blur').bind('blur', function(e) {
+		$wrapper.removeClass('focused');
+	});
+
 	$input.unbind('paste').bind('paste', function(e) {
 		e.preventDefault();
 		var pastedText;