diff --git a/core/modules/views/views_ui/admin.inc b/core/modules/views/views_ui/admin.inc
index e6215af..ba5802b 100644
--- a/core/modules/views/views_ui/admin.inc
+++ b/core/modules/views/views_ui/admin.inc
@@ -1216,7 +1216,12 @@ function views_ui_add_item_form($form, &$form_state) {
   $type = $form_state['type'];
 
   $form = array(
-    'override' => array(),
+    'override' => array(
+      // 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,
+    ),
     'options' => array(
       '#theme_wrappers' => array('container'),
       '#attributes' => array('class' => array('scroll')),
diff --git a/core/modules/views/views_ui/js/views-admin.js b/core/modules/views/views_ui/js/views-admin.js
index db5c2ad..c6f380d 100644
--- a/core/modules/views/views_ui/js/views-admin.js
+++ b/core/modules/views/views_ui/js/views-admin.js
@@ -345,7 +345,7 @@ Drupal.viewsUi.OptionsSearch = function ($form) {
 
   this.$form = $form;
   // Add a keyup handler to the search box.
-  this.$searchBox = this.$form.find('#edit-options-search');
+  this.$searchBox = this.$form.find('#edit-override-controls-options-search');
   this.$searchBox.keyup(jQuery.proxy(this.handleKeyup, this));
   // Get a list of option labels and their corresponding divs and maintain it
   // in memory, so we have as little overhead as possible at keyup time.