diff --git a/web/app/components/comment/comment.jsx b/web/app/components/comment/comment.jsx
index 18512f68..64ce3b32 100644
--- a/web/app/components/comment/comment.jsx
+++ b/web/app/components/comment/comment.jsx
@@ -65,7 +65,11 @@ export default class Comment extends Component {
     this.setState({ isInputVisible: !isInputVisible });
 
     if (this.props.onReplyClick) {
-      this.props.onReplyClick(() => this.setState({ isInputVisible: false }));
+      if (!isInputVisible) {
+        this.props.onReplyClick(() => this.setState({ isInputVisible: false }));
+      } else {
+        this.props.onReplyClick(null);
+      }
     }
   }