diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index dd5ac0c..f405300 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -63,6 +63,9 @@ textarea,
 select {
   font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
 }
+select {
+  max-width: 100%;
+}
 input {
   margin: 2px 0;
   padding: 4px;
@@ -280,3 +283,14 @@ input.form-submit:focus {
 .form-item--error-message {
   color: #e32700;
 }
+
+@media screen and (max-width: 600px) {
+  form input:not([type="checkbox"]) {
+    width: 100%;
+  }
+  .form-actions input {
+    padding: 0.6em;
+    border: 0;
+    border: 1px solid #ccc;
+  }
+}
diff --git a/core/themes/bartik/css/components/search-form.css b/core/themes/bartik/css/components/search-form.css
index b8c4017..f7842f5 100644
--- a/core/themes/bartik/css/components/search-form.css
+++ b/core/themes/bartik/css/components/search-form.css
@@ -38,3 +38,17 @@
 .search-form .form-item-keys label {
   display: block;
 }
+
+@media screen and (max-width: 600px) {
+  .search-form .form-search {
+    margin: 2px 0;
+    padding: 4px;
+    box-sizing: border-box;
+  }
+  .button.search-form__submit,
+  .search-form__submit {
+    width: 100%;
+    padding: 0.6em;
+    border: 1px solid #ccc;
+  }
+}