1 files changed, 6 insertions, 0 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 797b98ce2..9e7c67515 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -75,6 +75,8 @@ class CreateComment extends React.Component {
     componentDidMount() {
         PreferenceStore.addChangeListener(this.onPreferenceChange);
         window.addEventListener('resize', this.handleResize);
+
+        this.refs.textbox.focus();
     }
     componentWillUnmount() {
         PreferenceStore.removeChangeListener(this.onPreferenceChange);
@@ -95,6 +97,10 @@ class CreateComment extends React.Component {
                 $('.post-right__scroll').perfectScrollbar('update');
             }
         }
+
+        if (prevProps.rootId !== this.props.rootId) {
+            this.refs.textbox.focus();
+        }
     }
     handleSubmit(e) {
         e.preventDefault();