diff --git a/scss/form/inputs.scss b/scss/form/inputs.scss
index b73b791..f525a54 100644
--- a/scss/form/inputs.scss
+++ b/scss/form/inputs.scss
@@ -1,18 +1,17 @@
 .nes-input,
 .nes-textarea {
   @mixin border-style($border, $outline) {
-    @include compact-rounded-corners();
     @include compact-border-image($border);
 
     outline-color: $outline;
   }
 
+  @include compact-rounded-corners();
+
   width: 100%;
   padding: 0.5rem 1rem;
   margin: 4px;
 
-  @include border-style($base-color, map-get($default-colors, "hover"));
-
   &.is-dark {
     @include border-style(map-get($default-colors, "normal"), map-get($default-colors, "hover"));
 
diff --git a/scss/utilities/rounded-corners-mixin.scss b/scss/utilities/rounded-corners-mixin.scss
index eec9ef1..7d00e5d 100644
--- a/scss/utilities/rounded-corners-mixin.scss
+++ b/scss/utilities/rounded-corners-mixin.scss
@@ -16,6 +16,7 @@
 
   border-image-slice: 3;
   border-image-width: 3;
+  border-image-repeat: space;
 
   @if $isDark {
     @include border-image($color-white);
@@ -33,6 +34,7 @@
 
   border-image-slice: 2;
   border-image-width: 2;
+  border-image-repeat: space;
 
   @if $isDark {
     @include compact-border-image($color-white);