diff --git a/web/app/components/comment/comment.jsx b/web/app/components/comment/comment.jsx
index d59e0b70..abd35664 100644
--- a/web/app/components/comment/comment.jsx
+++ b/web/app/components/comment/comment.jsx
@@ -391,6 +391,7 @@ export default class Comment extends Component {
     const lowCommentScore = config.low_score;
     const votingDisabledReason = this.getVoteDisabledReason();
     const isVotingDisabled = votingDisabledReason !== null;
+    const editable = data.repliesCount === 0 && !!editTimeLeft;
 
     const o = {
       ...data,
@@ -588,7 +589,7 @@ export default class Comment extends Component {
               !mods.disabled &&
               !!o.orig &&
               isCurrentUser &&
-              (!!editTimeLeft || isEditing) &&
+              (editable || isEditing) &&
               mods.view !== 'user' && [
                 <span
                   {...getHandleClickProps(this.toggleEditing)}
diff --git a/web/app/components/input/input.jsx b/web/app/components/input/input.jsx
index 1fc54368..6c9621c6 100644
--- a/web/app/components/input/input.jsx
+++ b/web/app/components/input/input.jsx
@@ -21,6 +21,7 @@ export default class Input extends Component {
     this.state = {
       preview: null,
       isErrorShown: false,
+      errorMessage: null,
       isDisabled: false,
       maxLength: config.max_comment_size || DEFAULT_MAX_COMMENT_SIZE,
       text: props.value || '',
@@ -60,6 +61,7 @@ export default class Input extends Component {
     this.setState({
       preview: null,
       isErrorShown: false,
+      errorMessage: null,
       text: e.target.value,
     });
   }
@@ -87,8 +89,17 @@ export default class Input extends Component {
 
         this.setState({ preview: null, text: '' });
       })
-      .catch(() => {
-        this.setState({ isErrorShown: true });
+      .catch(e => {
+        if (
+          e.response &&
+          e.response.data &&
+          typeof e.response.data.error === 'string' &&
+          e.response.data.error.indexOf("parent comment with reply can't be edited") === 0
+        ) {
+          this.setState({ isErrorShown: true, errorMessage: 'Comment has reply, editing is not possible' });
+          return;
+        }
+        this.setState({ isErrorShown: true, errorMessage: null });
       })
       .finally(() => this.setState({ isDisabled: false }));
   }
@@ -98,19 +109,20 @@ export default class Input extends Component {
 
     if (!text || !text.trim()) return;
 
-    this.setState({ isErrorShown: false });
+    this.setState({ isErrorShown: false, errorMessage: null });
 
     api
       .getPreview({ text })
       .then(preview => this.setState({ preview }))
       .catch(() => {
-        this.setState({ isErrorShown: true });
+        this.setState({ isErrorShown: true, errorMessage: null });
       });
   }
 
-  render(props, { isDisabled, isErrorShown, preview, maxLength, text }) {
+  render(props, { isDisabled, isErrorShown, errorMessage, preview, maxLength, text }) {
     const charactersLeft = maxLength - text.length;
-    const { mods = {}, errorMessage, userId } = props;
+    const { mods = {}, userId } = props;
+    errorMessage = props.errorMessage || errorMessage;
 
     return (
       <form className={b('input', props)} onSubmit={this.send} aria-label="New comment">
diff --git a/web/app/components/thread/thread.jsx b/web/app/components/thread/thread.jsx
index 1b2342af..af7240f9 100644
--- a/web/app/components/thread/thread.jsx
+++ b/web/app/components/thread/thread.jsx
@@ -31,7 +31,7 @@ class Thread extends Component {
         aria-expanded={!collapsed}
       >
         <Comment
-          data={comment}
+          data={{ ...comment, repliesCount: replies.length }}
           isCommentsDisabled={isCommentsDisabled}
           mods={{ level: mods.level, collapsed }}
           onReply={props.onReply}