diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html
index 8293d31cc..95d797331 100644
--- a/app/templates/views/api/keys.html
+++ b/app/templates/views/api/keys.html
@@ -23,19 +23,18 @@
       {% endcall %}
     </div>
   {% else %}
-
+    <div class="grid-row">
+      <div class="column-two-thirds">
+        <h1 class="heading-large">
+          API keys
+        </h1>
+      </div>
+      <div class="column-one-third">
+        <a href="{{ url_for('.create_api_key', service_id=current_service.id) }}" class="button align-with-heading">Create an API key</a>
+      </div>
+    </div>
   {% endif %}
 
-  <div class="grid-row">
-    <div class="column-two-thirds">
-      <h1 class="heading-large">
-        API keys
-      </h1>
-    </div>
-    <div class="column-one-third">
-      <a href="{{ url_for('.create_api_key', service_id=current_service.id) }}" class="button align-with-heading">Create an API key</a>
-    </div>
-  </div>
   <div class="body-copy-table">
     {% call(item, row_number) list_table(
       keys,
diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html
index a2638582d..95ea73c83 100644
--- a/app/templates/views/templates/template.html
+++ b/app/templates/views/templates/template.html
@@ -27,9 +27,7 @@
         </form>
       {% endcall %}
     </div>
-  {% endif %}
-
-  {% if template_delete_confirmation_message %}
+  {% elif template_delete_confirmation_message %}
     <div class="bottom-gutter">
       {% call banner_wrapper(type='dangerous', subhead=template_delete_confirmation_message[0]) %}
         <p>
@@ -41,10 +39,10 @@
         </form>
       {% endcall %}
     </div>
+  {% else %}
+    <h1 class="heading-large">{{ template.name }}</h1>
   {% endif %}
 
-  <h1 class="heading-large">{{ template.name }}</h1>
-
   <div class="grid-row">
     {% with show_title=False, expanded=True %}
       {% include 'views/templates/_template.html' %}