diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss
index ce6197840b..209b6a56e1 100644
--- a/scss/forms/_form-control.scss
+++ b/scss/forms/_form-control.scss
@@ -113,5 +113,13 @@
 
 .form-control-color {
   max-width: 3rem;
-  padding: ($input-padding-y / 2) ($input-padding-x / 2);
+  padding: $input-padding-y;
+}
+
+.form-control-color::-moz-color-swatch {
+  @include border-radius($input-border-radius);
+}
+
+.form-control-color::-webkit-color-swatch {
+  @include border-radius($input-border-radius);
 }