1 files changed, 11 insertions, 3 deletions

diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx
index 38d31d66f..90d9696e7 100644
--- a/web/react/components/edit_post_modal.jsx
+++ b/web/react/components/edit_post_modal.jsx
@@ -37,16 +37,15 @@ export default class EditPostModal extends React.Component {
 
         Client.updatePost(updatedPost,
             function success() {
-                AsyncClient.getPosts(this.state.channel_id);
+                AsyncClient.getPosts(updatedPost.channel_id);
                 window.scrollTo(0, 0);
-            }.bind(this),
+            },
             function error(err) {
                 AsyncClient.dispatchError(err, 'updatePost');
             }
         );
 
         $('#edit_post').modal('hide');
-        $(this.state.refocusId).focus();
     }
     handleEditInput(editMessage) {
         this.setState({editText: editMessage});
@@ -90,6 +89,15 @@ export default class EditPostModal extends React.Component {
 
         $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', function onShown() {
             self.refs.editbox.resize();
+            $('#edit_textbox').get(0).focus();
+        });
+
+        $(React.findDOMNode(this.refs.modal)).on('hide.bs.modal', function onShown() {
+            if (self.state.refocusId !== '') {
+                setTimeout(() => {
+                    $(self.state.refocusId).get(0).focus();
+                });
+            }
         });
 
         PostStore.addEditPostListener(this.handleEditPostEvent);