diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss
index 61b1428b33..0a315e6799 100644
--- a/cms/static/sass/views/_unit.scss
+++ b/cms/static/sass/views/_unit.scss
@@ -1403,3 +1403,9 @@ body.unit .component {
     margin-top: ($baseline*1.5);
   }
 }
+
+body.unit .component.editing {
+  .xmodule_DiscussionModule, .xmodule_HtmlModule, .xblock {
+    margin-top: 0;
+  }
+}