diff --git a/core/modules/views_ui/admin.inc b/core/modules/views_ui/admin.inc
index dc7b8ee..c733bab 100644
--- a/core/modules/views_ui/admin.inc
+++ b/core/modules/views_ui/admin.inc
@@ -222,7 +222,7 @@ function views_ui_standard_display_dropdown(&$form, FormStateInterface $form_sta
   // @todo Move this to a separate function if it's needed on any forms that
   // don't have the display dropdown.
   $form['override'] = array(
-    '#prefix' => '<div class="views-override clearfix container-inline" data-drupal-views-offset="top">',
+    '#prefix' => '<div class="views-override clearfix form--inline" data-drupal-views-offset="top">',
     '#suffix' => '</div>',
     '#weight' => -1000,
     '#tree' => TRUE,
diff --git a/core/modules/views_ui/css/views_ui.admin.theme.css b/core/modules/views_ui/css/views_ui.admin.theme.css
index b5f2a03..619113e 100644
--- a/core/modules/views_ui/css/views_ui.admin.theme.css
+++ b/core/modules/views_ui/css/views_ui.admin.theme.css
@@ -852,12 +852,12 @@ td.group-title {
 }
 
 #views-filterable-options-controls .form-item {
-  width: 45%;
-  margin-right: 2%; /* LTR */
+  width: 30%;
+  margin: 0 0 0 2%; /* LTR */
+}
 }
 [dir="rtl"] #views-filterable-options-controls .form-item {
-  margin-left: 2%;
-  margin-right: 0;
+  margin: 0 2% 0 0;
 }
 
 #views-filterable-options-controls input,
diff --git a/core/modules/views_ui/src/Form/Ajax/AddHandler.php b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
index 02d6e30..92af615 100644
--- a/core/modules/views_ui/src/Form/Ajax/AddHandler.php
+++ b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
@@ -87,7 +87,7 @@ public function buildForm(array $form, FormStateInterface $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('form--inline')),
       );
       $form['override']['controls']['options_search'] = array(
         '#type' => 'textfield',