diff --git a/src/editable-form/editable-form.css b/src/editable-form/editable-form.css
index 942357a..4e03b8f 100644
--- a/src/editable-form/editable-form.css
+++ b/src/editable-form/editable-form.css
@@ -8,6 +8,14 @@
     line-height: 20px; /* overwriting bootstrap line-height. See #133 */
 }
 
+/* 
+  BS3 width:1005 for inputs breaks editable form in popup 
+  See: https://github.com/vitalets/x-editable/issues/393
+*/
+.editableform .form-control {
+    width: auto;
+}
+
 .editable-buttons {
    display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
    vertical-align: top;