diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index 2bd1a57f7b..73b47024c4 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -24,8 +24,14 @@ export default class PostInfo extends React.Component {
     }
     createReplyLink() {
         if (this.props.allowReply === 'true') {
+            var hideReply = '';
+
+            if (this.props.commentCount >= 1) {
+                hideReply = ' post__reply--hide';
+            }
+
             return (
-                <div className='post__reply'>
+                <div className={'post__reply' + hideReply}>
                     <a
                         onClick={this.props.handleCommentClick}
                         href='#'
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 7d1210f64b..a37974c7a0 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -78,16 +78,10 @@
 
             &:hover {
                 background: transparent;
+            }
 
-                .comment-icon__container {
-                    visibility: hidden;
-
-                    &.icon--show {
-                        visibility: visible;
-                    }
-
-                }
-
+            .comment-icon__container {
+                visibility: hidden;
             }
 
         }
@@ -124,8 +118,34 @@
 
     .post {
 
+        .post__body {
+            width: calc(100% - 75px);
+        }
+
+        .post__reply {
+            margin-right: 20px;
+            float: right;
+
+            svg {
+                top: 1px;
+            }
+
+        }
+
+        &.other--root .post__reply {
+
+            &.post__reply--hide {
+                visibility: hidden;
+            }
+
+        }
+
         .post__header {
 
+            .col__reply {
+                width: 65px;
+            }
+
             .col__name {
                 pointer-events: none;
             }