diff --git a/core/modules/search/lib/Drupal/search/Form/SearchForm.php b/core/modules/search/lib/Drupal/search/Form/SearchForm.php
index fe49f16eba361702354bd83f603ab02b65dbfb5b..35b0ff9ea887b0fc7b36ffa74e5317060b294ef0 100644
--- a/core/modules/search/lib/Drupal/search/Form/SearchForm.php
+++ b/core/modules/search/lib/Drupal/search/Form/SearchForm.php
@@ -80,7 +80,7 @@ public function buildForm(array $form, array &$form_state, SearchInterface $plug
       '#type' => 'search',
       '#title' => $prompt,
       '#default_value' => $plugin->getKeywords(),
-      '#size' => $prompt ? 40 : 20,
+      '#size' => $prompt ? 30 : 20,
       '#maxlength' => 255,
     );
     // processed_keys is used to coordinate keyword passing between other forms
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 2b426ab955e3e5d0f627dc03f232953364b5ed0b..6c7a8fc7baf9e9118eaba5ec772c211efc057a66 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -1579,7 +1579,6 @@ div.password-suggestions {
   float: left; /* LTR */
   font-size: 1em;
   margin-right: 5px;
-  width: 9em;
 }
 [dir="rtl"] #search-form input#edit-keys,
 [dir="rtl"] #block-search-form .form-item-search-block-form input {