diff --git a/core/misc/dialog.ajax.js b/core/misc/dialog.ajax.js
index c33a5e6..7846d48 100644
--- a/core/misc/dialog.ajax.js
+++ b/core/misc/dialog.ajax.js
@@ -92,7 +92,7 @@
     ajax.commands.insert(ajax, response, status);
 
     // Move the buttons to the jQuery UI dialog buttons area.
-    if (!response.dialogOptions.buttons) {
+    if (typeof response.dialogOptions.buttons === 'undefined' || response.dialogOptions.buttons === true) {
       response.dialogOptions.drupalAutoButtons = true;
       response.dialogOptions.buttons = Drupal.behaviors.dialog.prepareDialogButtons($dialog);
     }
diff --git a/core/modules/views/includes/ajax.inc b/core/modules/views/includes/ajax.inc
index 6bcdd22..04a1add 100644
--- a/core/modules/views/includes/ajax.inc
+++ b/core/modules/views/includes/ajax.inc
@@ -54,6 +54,8 @@ function views_ajax_form_wrapper($form_id, &$form_state) {
     $options = array(
       'dialogClass' => 'views-ui-dialog',
       'width' => '50%',
+      // Views UI buttons need to have special handling.
+      'buttons' => FALSE,
     );
 
     $response->addCommand(new OpenModalDialogCommand($title, $display, $options));
diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js
index ee70f1f..e7d62a3 100644
--- a/core/modules/views_ui/js/views-admin.js
+++ b/core/modules/views_ui/js/views-admin.js
@@ -357,7 +357,7 @@ $.extend(Drupal.viewsUi.OptionsSearch.prototype, {
 
     // Determine the user's search query. The search text has been converted to
     // lowercase.
-    search = this.$searchBox.val().toLowerCase();
+    search = (this.$searchBox.val() || '').toLowerCase();
     words = search.split(' ');
     wordsLength = words.length;
 
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
index 371817a..32a356b 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
@@ -86,7 +86,10 @@ public function buildForm(array $form, array &$form_state) {
       $form['override']['controls'] = array(
         '#theme_wrappers' => array('container'),
         '#id' => 'views-filterable-options-controls',
-        '#attributes' => array('class' => array('container-inline')),
+        '#attributes' => array(
+          'class' => array('container-inline'),
+          'data-drupal-views-offset' => 'top',
+        ),
       );
       $form['override']['controls']['options_search'] = array(
         '#type' => 'textfield',
@@ -180,6 +183,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['actions']['submit']['#submit'] = array_filter($form['actions']['submit']['#submit'], function($var) {
       return !(is_array($var) && isset($var[1]) && $var[1] == 'standardSubmit');
     });
+    $form['actions']['#attributes']['data-drupal-views-offset'] = 'bottom';
     $form['actions']['submit']['#submit'][] = array($view, 'submitItemAdd');
 
     return $form;