diff --git a/src/js/index.js b/src/js/index.js
index 65e804203..73e85bffd 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -628,6 +628,9 @@ app.directive('tagInput', function () {
                     return tempEl.remove();
                 }
             });
+            element.bind('click', function () {
+                element[0].firstChild.lastChild.focus();
+            });
             element.bind('keydown', function (e) {
                 var key = e.which;
                 if (key === 9 || key === 13) {
diff --git a/src/theme.scss b/src/theme.scss
index daae4fb08..9d4201283 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1363,6 +1363,7 @@ footer {
 
 tag-input {
     height: auto !important;
+    cursor: text;
 
     .tag-input-container {
         display: flex;