diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx
index b259b3c18a..e5bede0265 100644
--- a/web/react/components/edit_post_modal.jsx
+++ b/web/react/components/edit_post_modal.jsx
@@ -84,7 +84,7 @@ export default class EditPostModal extends React.Component {
             if (!button) {
                 return;
             }
-            self.setState({editText: $(button).attr('data-message'), title: $(button).attr('data-title'), channel_id: $(button).attr('data-channelid'), post_id: $(button).attr('data-postid'), comments: $(button).attr('data-comments'), refocusId: $(button).attr('data-refoucsid')});
+            self.setState({editText: $(button).attr('data-message'), title: $(button).attr('data-title'), channel_id: $(button).attr('data-channelid'), post_id: $(button).attr('data-postid'), comments: $(button).attr('data-comments'), refocusId: $(button).attr('data-refocusid')});
         });
 
         $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', function onShown() {
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index 36260d77c4..6937ec2166 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -44,7 +44,7 @@ export default class PostInfo extends React.Component {
                         role='menuitem'
                         data-toggle='modal'
                         data-target='#edit_post'
-                        data-refoucsid='#post_textbox'
+                        data-refocusid='#post_textbox'
                         data-title={type}
                         data-message={post.message}
                         data-postid={post.id}
diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx
index cfff04fa2d..8c6324c72c 100644
--- a/web/react/components/rhs_comment.jsx
+++ b/web/react/components/rhs_comment.jsx
@@ -93,6 +93,7 @@ export default class RhsComment extends React.Component {
                         role='menuitem'
                         data-toggle='modal'
                         data-target='#edit_post'
+                        data-refocusid='#reply_textbox'
                         data-title='Comment'
                         data-message={post.message}
                         data-postid={post.id}
diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx
index deef389e25..21e52b4384 100644
--- a/web/react/components/rhs_root_post.jsx
+++ b/web/react/components/rhs_root_post.jsx
@@ -79,6 +79,7 @@ export default class RhsRootPost extends React.Component {
                                 role='menuitem'
                                 data-toggle='modal'
                                 data-target='#edit_post'
+                                data-refocusid='#reply_textbox'
                                 data-title={type}
                                 data-message={post.message}
                                 data-postid={post.id}