1 files changed, 8 insertions, 4 deletions

diff --git a/webapp/components/edit_post_modal.jsx b/webapp/components/edit_post_modal.jsx
index 3ec7fedcc..683371d23 100644
--- a/webapp/components/edit_post_modal.jsx
+++ b/webapp/components/edit_post_modal.jsx
@@ -21,6 +21,11 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import {FormattedMessage} from 'react-intl';
 
+import store from 'stores/redux_store.jsx';
+const getState = store.getState;
+
+import * as Selectors from 'mattermost-redux/selectors/entities/posts';
+
 export default class EditPostModal extends React.Component {
     constructor(props) {
         super(props);
@@ -85,7 +90,7 @@ export default class EditPostModal extends React.Component {
             Reflect.deleteProperty(tempState, 'editText');
             BrowserStore.setItem('edit_state_transfer', tempState);
             $('#edit_post').modal('hide');
-            GlobalActions.showDeletePostModal(PostStore.getPost(this.state.channel_id, this.state.post_id), this.state.comments);
+            GlobalActions.showDeletePostModal(Selectors.getPost(getState(), this.state.post_id), this.state.comments);
             return;
         }
 
@@ -93,8 +98,7 @@ export default class EditPostModal extends React.Component {
             updatedPost,
             () => {
                 window.scrollTo(0, 0);
-            },
-            Boolean(PostStore.getFocusedPostId())  // If there is focused post we need to update that post's store too.
+            }
         );
 
         $('#edit_post').modal('hide');
@@ -120,7 +124,7 @@ export default class EditPostModal extends React.Component {
     }
 
     handleEditPostEvent(options) {
-        var post = PostStore.getPost(options.channelId, options.postId);
+        const post = Selectors.getPost(getState(), options.postId);
         if (global.window.mm_license.IsLicensed === 'true') {
             if (global.window.mm_config.AllowEditPost === Constants.ALLOW_EDIT_POST_NEVER) {
                 return;