diff --git a/core/modules/views/views_ui/admin.inc b/core/modules/views/views_ui/admin.inc
index c22b54c..5c73569 100644
--- a/core/modules/views/views_ui/admin.inc
+++ b/core/modules/views/views_ui/admin.inc
@@ -418,6 +418,14 @@ function views_ui_standard_display_dropdown(&$form, &$form_state, $section) {
   $displays = $executable->displayHandlers;
   $current_display = $executable->display_handler;
 
+  // Always put
+  $form['override'] = array(
+    '#prefix' => '<div class="views-override clearfix container-inline">',
+    '#suffix' => '</div>',
+    '#weight' => -1000,
+    '#tree' => TRUE,
+  );
+
   // Add the "2 of 3" progress indicator.
   // @TODO: Move this to a separate function if it's needed on any forms that
   // don't have the display dropdown.
@@ -1216,16 +1224,6 @@ function views_ui_add_item_form($form, &$form_state) {
     ),
   );
 
-  $form['override'] = array(
-    '#prefix' => '<div class="views-override clearfix container-inline">',
-    '#suffix' => '</div>',
-    '#weight' => -1000,
-    // Force '#tree' => TRUE, so views_ui_standard_display_dropdown() does
-    // not change that. If it changes the IDs of the generated html changes
-    // and based on that JS/CSS can break.
-    '#tree' => TRUE,
-  );
-
   $executable = $view->get('executable');
   if (!$executable->setDisplay($display_id)) {
     views_ajax_error(t('Invalid display id @display', array('@display' => $display_id)));