diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js
index d8fe7267a4..a0dd47356a 100644
--- a/awx/ui/client/src/forms/JobTemplates.js
+++ b/awx/ui/client/src/forms/JobTemplates.js
@@ -173,10 +173,11 @@ export default
                 },
                 job_tags: {
                     label: 'Job Tags',
-                    type: 'textarea',
+                    type: 'text',
                     rows: 1,
                     addRequired: false,
                     editRequired: false,
+                    'elementClass': 'Form-textInput',
                     column: 2,
                     awPopOver: "<p>Provide a comma separated list of tags.</p>\n" +
                         "<p>Tags are useful when you have a large playbook, and you want to run a specific part of a play or task.</p>" +
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 44cef9dd0f..45d41c46ad 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1045,6 +1045,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         html += 'name="' + fld + '" ';
                         html += "class=\"form-control";
                         html += (field['class']) ? " " + field['class'] : "";
+                        html += (field['elementClass']) ? " " + field['elementClass'] : ""; 
                         html += "\" ";
                         html += (field.ngChange) ? this.attr(field, 'ngChange') : "";
                         html += buildId(field, fld, this.form);