diff --git a/django/contrib/admin/media/css/base.css b/django/contrib/admin/media/css/base.css
index 0b9e8b366b..6d1b673b90 100644
--- a/django/contrib/admin/media/css/base.css
+++ b/django/contrib/admin/media/css/base.css
@@ -350,6 +350,7 @@ table thead th.sorted a span.clear {
 }
 
 #sorting-popup-div {
+    display: none;
     position: absolute;
     background-color: white;
     border: 1px solid #ddd;
diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css
index 35d0ed796d..5149732719 100644
--- a/django/contrib/admin/media/css/forms.css
+++ b/django/contrib/admin/media/css/forms.css
@@ -167,6 +167,10 @@ fieldset.monospace textarea {
     overflow: hidden;
 }
 
+body.popup .submit-row {
+    overflow: auto;
+}
+
 .submit-row input {
     margin: 0 0 0 5px;
 }
diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html
index 6c1c399562..738ff28190 100644
--- a/django/contrib/admin/templates/admin/change_list_results.html
+++ b/django/contrib/admin/templates/admin/change_list_results.html
@@ -36,7 +36,7 @@
 </div>
 
 {# Sorting popup: #}
-<div style="display: none;" id="sorting-popup-div">
+<div id="sorting-popup-div">
 <table>
   <caption>
    {% trans "Sorting by:" %}
diff --git a/django/contrib/admin/templates/admin/submit_line.html b/django/contrib/admin/templates/admin/submit_line.html
index 8bb5d27bbf..d6f854a233 100644
--- a/django/contrib/admin/templates/admin/submit_line.html
+++ b/django/contrib/admin/templates/admin/submit_line.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="submit-row" {% if is_popup %}style="overflow: auto;"{% endif %}>
+<div class="submit-row">
 {% if show_save %}<input type="submit" value="{% trans 'Save' %}" class="default" name="_save" {{ onclick_attrib }}/>{% endif %}
 {% if show_delete_link %}<p class="deletelink-box"><a href="delete/" class="deletelink">{% trans "Delete" %}</a></p>{% endif %}
 {% if show_save_as_new %}<input type="submit" value="{% trans 'Save as new' %}" name="_saveasnew" {{ onclick_attrib }}/>{%endif%}