diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.css b/client/coral-admin/src/routes/Moderation/components/Comment.css
index b0d989c54..3c6f1a350 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.css
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.css
@@ -133,7 +133,6 @@
   color: #063b9a;
   cursor: pointer;
   font-weight: normal;
-  margin-left: 10px;
   white-space: nowrap;
 
   &:hover {
@@ -184,3 +183,9 @@
     }
   }
 }
+
+.commentContent {
+  height: 100%;
+  flex: 1;
+  display: flex;
+}
\ No newline at end of file
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 79da644ef..864e6631a 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -64,6 +64,12 @@ class Comment extends React.Component {
     const selectionStateCSS = selected ? 'mdl-shadow--16dp' : 'mdl-shadow--2dp';
     const queryData = { root, comment, asset: comment.asset };
 
+    const formatterSettings = {
+      suspectWords: settings.wordlist.suspect,
+      bannedWords: settings.wordlist.banned,
+      body: comment.body,
+    };
+
     return (
       <li
         tabIndex={0}
@@ -126,11 +132,15 @@ class Comment extends React.Component {
           <CommentAnimatedEdit body={comment.body}>
             <div className={styles.itemBody}>
               <div className={styles.body}>
-                <CommentFormatter
-                  suspectWords={settings.wordlist.suspect}
-                  bannedWords={settings.wordlist.banned}
-                  className="talk-admin-comment"
-                  body={comment.body}
+                <Slot
+                  fill="adminCommentContent"
+                  data={data}
+                  className={cn(styles.commentContent, 'talk-admin-comment')}
+                  clearHeightCache={clearHeightCache}
+                  queryData={queryData}
+                  slotSize={1}
+                  defaultComponent={CommentFormatter}
+                  {...formatterSettings}
                 />
                 <a
                   className={styles.external}
@@ -140,13 +150,7 @@ class Comment extends React.Component {
                   <Icon name="open_in_new" /> {t('comment.view_context')}
                 </a>
               </div>
-              <Slot
-                fill="adminCommentContent"
-                data={data}
-                clearHeightCache={clearHeightCache}
-                queryData={queryData}
-                slotSize={1}
-              />
+
               <div className={styles.sideActions}>
                 <IfHasLink text={comment.body}>
                   <span className={styles.hasLinks}>
diff --git a/client/coral-embed-stream/src/tabs/stream/components/DraftAreaContent.css b/client/coral-embed-stream/src/tabs/stream/components/DraftAreaContent.css
index 9de435aea..a1a79dd4b 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/DraftAreaContent.css
+++ b/client/coral-embed-stream/src/tabs/stream/components/DraftAreaContent.css
@@ -8,4 +8,5 @@
   border: 1px solid #9E9E9E;
   width: 100%;
   box-sizing: border-box;
+  height: 100%;
 }
\ No newline at end of file