diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2c5b3d8b2e..7eeb7ca84a 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 7ed443efb1..9684cc912e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -991,6 +991,7 @@ select:focus:required:invalid:focus {
 .input-append select,
 .input-prepend .uneditable-input,
 .input-append .uneditable-input {
+  position: relative;
   margin-bottom: 0;
   *margin-left: 0;
   vertical-align: middle;
@@ -1004,7 +1005,6 @@ select:focus:required:invalid:focus {
 .input-append select:focus,
 .input-prepend .uneditable-input:focus,
 .input-append .uneditable-input:focus {
-  position: relative;
   z-index: 2;
 }
 .input-prepend .uneditable-input,
diff --git a/less/forms.less b/less/forms.less
index 6c7faf0e20..a57732c13c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -365,13 +365,13 @@ select:focus:required:invalid {
   input,
   select,
   .uneditable-input {
+    position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
     margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
     vertical-align: middle;
     .border-radius(0 3px 3px 0);
     // Make input on top when focused so blue border and shadow always show
     &:focus {
-      position: relative;
       z-index: 2;
     }
   }