diff --git a/src/editable-form/editable-form.css b/src/editable-form/editable-form.css
index 4e03b8f..f7e8f25 100644
--- a/src/editable-form/editable-form.css
+++ b/src/editable-form/editable-form.css
@@ -8,6 +8,16 @@
     line-height: 20px; /* overwriting bootstrap line-height. See #133 */
 }
 
+/*
+    BS3 fix: stop css from breaking when the form is inside a popup and inside a form with the class .form-horizontal
+    See: https://github.com/vitalets/x-editable/issues/682
+*/
+.form-horizontal .editable-popup .editableform .form-group {
+    margin-left:0;
+    margin-right:0;
+}
+
+
 /* 
   BS3 width:1005 for inputs breaks editable form in popup 
   See: https://github.com/vitalets/x-editable/issues/393
@@ -140,4 +150,4 @@
 
 .editable-pre-wrapped {
    white-space: pre-wrap;
-}
\ No newline at end of file
+}