diff --git a/scss/_form.scss b/scss/_form.scss
index ce735af115c..8976a2f6ac4 100644
--- a/scss/_form.scss
+++ b/scss/_form.scss
@@ -214,10 +214,13 @@ input[type="color"] {
   }
 }
 
-input,
-textarea {
-  width: 100%;
+.item-input {
+  input,
+  textarea {
+    width: 100%;
+  }
 }
+
 textarea {
   padding-left: 0;
   @include placeholder($input-color-placeholder, -3px);
@@ -255,14 +258,16 @@ input[type="checkbox"] {
 }
 
 // Reset width of input images, buttons, radios, checkboxes
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto; // Override of generic input selector
+.item-input {
+  input[type="file"],
+  input[type="image"],
+  input[type="submit"],
+  input[type="reset"],
+  input[type="button"],
+  input[type="radio"],
+  input[type="checkbox"] {
+    width: auto; // Override of generic input selector
+  }
 }
 
 // Set the height of file to match text inputs
diff --git a/scss/_range.scss b/scss/_range.scss
index ebff266eb63..e926b51315f 100644
--- a/scss/_range.scss
+++ b/scss/_range.scss
@@ -4,7 +4,7 @@
  * --------------------------------------------------
  */
 
-input[type="range"] {
+ .range input{
   display: inline-block;
   overflow: hidden;
   margin-top: 5px;
@@ -119,4 +119,3 @@ input[type="range"] {
   padding-right: 5px;
   padding-left: 0;
 }
-