diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 7be53d91f8..7a55680417 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -861,6 +861,13 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
+.input-prepend input:focus,
+.input-append input:focus,
+.input-prepend .uneditable-input:focus,
+.input-append .uneditable-input:focus {
+  position: relative;
+  z-index: 2;
+}
 .input-prepend .uneditable-input, .input-append .uneditable-input {
   border-left-color: #ccc;
 }
diff --git a/less/forms.less b/less/forms.less
index c7342626f5..b8cb48b480 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -396,6 +396,10 @@ select:focus:required:invalid {
   input,
   .uneditable-input {
     .border-radius(0 3px 3px 0);
+    &:focus {
+      position: relative;
+      z-index: 2;
+    }
   }
   .uneditable-input {
     border-left-color: #ccc;