diff --git a/webapp/src/components/contentBlock.scss b/webapp/src/components/contentBlock.scss
index 9c7391c1d..4f0539893 100644
--- a/webapp/src/components/contentBlock.scss
+++ b/webapp/src/components/contentBlock.scss
@@ -13,4 +13,10 @@
         margin-bottom: 17px;
         flex-grow: 1;
     }
+    > * {
+        flex: 1 1 auto;
+    }
+    > .octo-block-margin {
+        flex: 0 0 auto;
+    }
 }
diff --git a/webapp/src/components/markdownEditor.scss b/webapp/src/components/markdownEditor.scss
index 3aed70900..04ec31ae1 100644
--- a/webapp/src/components/markdownEditor.scss
+++ b/webapp/src/components/markdownEditor.scss
@@ -2,7 +2,6 @@
 
 .MarkdownEditor {
 	cursor: text;
-	width: 100%;
     /* CodeMirror / SimpleMDE / EasyMDE overrides */
 
     .CodeMirror {
diff --git a/webapp/src/components/markdownEditor.tsx b/webapp/src/components/markdownEditor.tsx
index bc729347a..86fad88f5 100644
--- a/webapp/src/components/markdownEditor.tsx
+++ b/webapp/src/components/markdownEditor.tsx
@@ -179,7 +179,7 @@ class MarkdownEditor extends React.Component<Props, State> {
         const element =
             (<div
                 ref={this.frameRef}
-                className={`MarkdownEditor octo-editor ${this.props.className}`}
+                className={`MarkdownEditor octo-editor ${this.props.className || ''}`}
             >
                 {previewElement}
                 {editorElement}
diff --git a/webapp/src/styles/main.scss b/webapp/src/styles/main.scss
index 81db2bd4e..f38fcc72b 100644
--- a/webapp/src/styles/main.scss
+++ b/webapp/src/styles/main.scss
@@ -190,10 +190,6 @@ hr {
 
 	width: 100%;
 	padding-right: 126px;
-
-    * {
-	    flex-shrink: 0;
-    }
 }
 
 .octo-block-margin {