diff --git a/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js b/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
index ef49949f5c..2eca269f62 100644
--- a/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
+++ b/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
@@ -3,7 +3,7 @@
 
     angular.module('theHiveComponents')
         .component('orgCaseTemplateList', {
-            controller: function($uibModal, $scope, CaseTemplateSrv, UserSrv, AuthenticationSrv, NotificationSrv, UtilsSrv, ModalUtilsSrv) {
+            controller: function($uibModal, $scope, CaseTemplateSrv, TagSrv, UserSrv, AuthenticationSrv, NotificationSrv, UtilsSrv, ModalUtilsSrv) {
                 var self = this;
 
                 self.task = '';
@@ -327,6 +327,10 @@
                             }
                         });
                 };
+
+                self.getTags = function(query) {
+                    return TagSrv.fromCases(query);
+                };
             },
             controllerAs: '$vm',
             templateUrl: 'views/components/org/case-template/case-templates.html',
diff --git a/frontend/app/views/components/org/case-template/details.html b/frontend/app/views/components/org/case-template/details.html
index 60e9a8221f..cf7d7403fa 100644
--- a/frontend/app/views/components/org/case-template/details.html
+++ b/frontend/app/views/components/org/case-template/details.html
@@ -61,7 +61,9 @@ <h4 class="vpad10 text-primary">Case basic information</h4>
 <div class="form-group">
     <label class="col-md-3 control-label">Tags</label>
     <div class="col-md-9">
-        <tags-input min-length="2" name="tags" ng-model="$vm.tags" placeholder="Tags" replace-spaces-with-dashes="false"></tags-input>
+        <tags-input min-length="2" name="tags" ng-model="$vm.tags" placeholder="Tags" replace-spaces-with-dashes="false">
+            <auto-complete min-length="3" debounce-delay="400" source="$vm.getTags($query)"></auto-complete>
+        </tags-input>
         <p class="help-block small vpad5">These will be the default case tags</p>
     </div>
 </div>