diff --git a/awx/ui/client/features/templates/index.controller.js b/awx/ui/client/features/templates/index.controller.js
index 5f305345a9..c859255070 100644
--- a/awx/ui/client/features/templates/index.controller.js
+++ b/awx/ui/client/features/templates/index.controller.js
@@ -11,9 +11,9 @@ function IndexTemplatesController ($scope, strings, dataset) {
 }
 
 IndexTemplatesController.$inject = [
-	'$scope',
+    '$scope',
     'TemplatesStrings',
-    'Dataset',
+    'Dataset'
 ];
 
 export default IndexTemplatesController;
diff --git a/awx/ui/client/features/templates/index.view.html b/awx/ui/client/features/templates/index.view.html
index 6323fd8129..5f6ae703f6 100644
--- a/awx/ui/client/features/templates/index.view.html
+++ b/awx/ui/client/features/templates/index.view.html
@@ -1,10 +1,20 @@
 <div ui-view="form"></div>
-<at-panel>
-    <at-panel-heading>
-        {{:: vm.strings.get('list.PANEL_TITLE') }}
-        <div class="at-Panel-headingTitleBadge" ng-show="vm.count">
-            {{ vm.count }}
-        </div>
-    </at-panel-heading>
+<at-panel ng-cloak id="htmlTemplate">
+    <div ng-if="$state.is('templates')">
+        <at-panel-heading hide-dismiss="true">
+            {{:: vm.strings.get('list.PANEL_TITLE') }}
+            <div class="at-Panel-headingTitleBadge" ng-show="vm.count">
+                {{ vm.count }}
+            </div>
+        </at-panel-heading>
+    </div>
+    <div ng-if="!$state.is('templates')">
+        <at-panel-heading>
+            {{:: vm.strings.get('list.PANEL_TITLE') }}
+            <div class="at-Panel-headingTitleBadge" ng-show="vm.count">
+                {{ vm.count }}
+            </div>
+        </at-panel-heading>
+    </div>
     <div ui-view="templatesList"></div>
 </at-panel>