diff --git a/horizon/dashboards/nova/templates/nova/base.html b/horizon/dashboards/nova/templates/nova/base.html
deleted file mode 100644
index 7079b8736..000000000
--- a/horizon/dashboards/nova/templates/nova/base.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n %}
-
-{% block content %}
-{% if request.user.is_superuser %}
-<div class="warning">
-  <div class="warning-text">
-    <h3 class="alert-error">
-        <strong>{% trans "Caution" %}:</strong>
-        <span>{% trans "You are acting as an admin user in the project dashboard." %}</span>
-    </h3>
-    <a href="{% url horizon:nova:overview:warning %}" class="btn btn-small btn-danger ajax-modal">{% trans "Learn More" %}</a>
-  </div>
-</div>
-{% endif %}
-{{ block.super }}
-{% endblock %}
diff --git a/horizon/templates/base.html b/horizon/templates/base.html
index 32418df64..4bda5eabe 100644
--- a/horizon/templates/base.html
+++ b/horizon/templates/base.html
@@ -12,6 +12,18 @@
   </head>
   <body id="{% block body_id %}{% endblock %}">
     {% block content %}
+      {# FIXME(gabriel): remove the following warning block when Nova fixes their scoping upstream. #}
+      {% if request.user.is_superuser and request.horizon.dashboard.slug == "nova" %}
+        <div class="warning">
+          <div class="warning-text">
+            <h3 class="alert-error">
+                <strong>{% trans "Caution" %}:</strong>
+                <span>{% trans "You are acting as an admin user in the project dashboard." %}</span>
+            </h3>
+            <a href="{% url horizon:nova:overview:warning %}" class="btn btn-small btn-danger ajax-modal">{% trans "Learn More" %}</a>
+          </div>
+        </div>
+      {% endif %}
       <div id="container">
         {% block sidebar %}
           {% include 'horizon/common/_sidebar.html' %}
