diff --git a/.gitignore b/.gitignore
index c7401a7..40ea3eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@ node_modules
 css
 storybook-static
 .DS_Store
+
+# Ignoring built up css and map files
+scss/*.css
+scss/*.css.map
\ No newline at end of file
diff --git a/scss/form/inputs.scss b/scss/form/inputs.scss
index e53c601..6609dc3 100644
--- a/scss/form/inputs.scss
+++ b/scss/form/inputs.scss
@@ -8,7 +8,7 @@
 
   @include compact-rounded-corners();
 
-  width: 100%;
+  width: calc(100% -  #{2*$border-size});
   padding: 0.5rem 1rem;
   margin: 4px;
   background-clip: padding-box;
diff --git a/scss/form/selects.scss b/scss/form/selects.scss
index fc3ada5..44e0e45 100644
--- a/scss/form/selects.scss
+++ b/scss/form/selects.scss
@@ -11,7 +11,7 @@
   $colors: ($base-color, map-get($default-colors, "shadow"));
 
   position: relative;
-  width: 100%;
+  width: calc(100% -  #{2*$border-size});
   margin: 4px;
 
   select {