diff --git a/common/static/css/boofilsic.css b/common/static/css/boofilsic.css
index d19c48c8..f52d4955 100644
--- a/common/static/css/boofilsic.css
+++ b/common/static/css/boofilsic.css
@@ -144,10 +144,6 @@ textarea {
   width: 100%;
 }
 
-input, select {
-  width: 100%;
-}
-
 label,
 legend {
   display: block;
@@ -1073,6 +1069,11 @@ select::placeholder {
 .main-section-wrapper {
   padding: 32px 48px 32px 36px;
   background-color: #f7f7f7;
+  overflow: auto;
+}
+
+.main-section-wrapper input, .main-section-wrapper select {
+  width: 100%;
 }
 
 .entity-list .entity-list__title {
@@ -1525,6 +1526,7 @@ select::placeholder {
   padding: 28px 25px 12px 25px;
   background-color: #f7f7f7;
   margin-bottom: 30px;
+  overflow: auto;
 }
 
 .aside-section-wrapper--transparent {
@@ -1896,6 +1898,10 @@ select::placeholder {
   overflow: auto;
 }
 
+.single-section-wrapper input, .single-section-wrapper select {
+  width: 100%;
+}
+
 .entity-form, .review-form {
   overflow: auto;
 }
diff --git a/common/static/sass/_AsideSection.sass b/common/static/sass/_AsideSection.sass
index f381718b..06a4ea42 100644
--- a/common/static/sass/_AsideSection.sass
+++ b/common/static/sass/_AsideSection.sass
@@ -10,6 +10,7 @@ $aside-section-padding-mobile: 24px 25px 10px 25px
     padding: $aside-section-padding
     background-color: $color-bright
     margin-bottom: 30px
+    overflow: auto
 
     &--transparent
         background-color: unset
diff --git a/common/static/sass/_Form.sass b/common/static/sass/_Form.sass
index d7f56916..36e21308 100644
--- a/common/static/sass/_Form.sass
+++ b/common/static/sass/_Form.sass
@@ -15,8 +15,8 @@ textarea
 	min-height: 6.5rem
 	width: 100%
 	
-input, select
-	width: 100%
+// input, select
+// 	width: 100%
 
 label,
 legend
diff --git a/common/static/sass/_MainSection.sass b/common/static/sass/_MainSection.sass
index bca2b5ff..87fd5dbe 100644
--- a/common/static/sass/_MainSection.sass
+++ b/common/static/sass/_MainSection.sass
@@ -9,6 +9,10 @@ $sub-section-title-margin: 8px
 .main-section-wrapper
 	padding: $main-section-padding
 	background-color: $color-bright
+	overflow: auto
+
+	& input, & select
+		width: 100%
 
 // for search result etc
 .entity-list
diff --git a/common/static/sass/_SingleSection.sass b/common/static/sass/_SingleSection.sass
index 7880893a..176e4d77 100644
--- a/common/static/sass/_SingleSection.sass
+++ b/common/static/sass/_SingleSection.sass
@@ -5,6 +5,9 @@ $single-section-padding-mobile: 32px 28px
     padding: $single-section-padding
     background-color: $color-bright
     overflow: auto
+    
+    & input, & select
+        width: 100%    
 
 .entity-form, .review-form
     overflow: auto