diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index f567dae..ca742c0 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -996,7 +996,7 @@ function search_form($form, &$form_state, $action = '', $keys = '', $module = NU
     '#type' => 'search',
     '#title' => $prompt,
     '#default_value' => $keys,
-    '#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 72f776d..d790adf 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -1393,11 +1393,12 @@ div.vertical-tabs .vertical-tabs-panes fieldset.vertical-tabs-pane {
 #block-search-form input[type="search"]::-webkit-search-decoration {
   display: none;
 }
-#search-form input#edit-keys,
-#block-search-form .form-item-search-block-form input {
+#search-form input#edit-keys {
   float: left; /* LTR */
   font-size: 1em;
   margin-right: 5px;
+}
+#block-search-form .form-item-search-block-form input {
   width: 9em;
 }
 #search-block-form input.form-submit,