diff --git a/less/forms.less b/less/forms.less
index 8d9c253083..1da8d7500f 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -391,7 +391,7 @@ select:focus:required:invalid {
   }
   .add-on,
   .btn {
-    .border-radius(3px 0 0 3px);
+    .border-radius(0);
   }
   .active {
     background-color: lighten(@green, 30);
@@ -403,6 +403,10 @@ select:focus:required:invalid {
   .btn {
     margin-right: -1px;
   }
+  .add-on:first-child,
+  .btn:first-child {
+    .border-radius(3px 0 0 3px);
+  }
 }
 .input-append {
   input,
@@ -417,6 +421,9 @@ select:focus:required:invalid {
   .add-on,
   .btn {
     margin-left: -1px;
+  }
+  .add-on:last-child,
+  .btn:last-child {
     .border-radius(0 3px 3px 0);
   }
 }