3 files changed, 15 insertions, 2 deletions

diff --git a/web/react/components/delete_post_modal.jsx b/web/react/components/delete_post_modal.jsx
index 3c4b17905..5e89a0893 100644
--- a/web/react/components/delete_post_modal.jsx
+++ b/web/react/components/delete_post_modal.jsx
@@ -152,6 +152,7 @@ export default class DeletePostModal extends React.Component {
                         type='button'
                         className='btn btn-danger'
                         onClick={this.handleDelete}
+                        autoFocus='autofocus'
                     >
                         {'Delete'}
                     </button>
diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx
index 24b0d0dd0..a8f0f9c63 100644
--- a/web/react/stores/post_store.jsx
+++ b/web/react/stores/post_store.jsx
@@ -39,6 +39,7 @@ class PostStoreClass extends EventEmitter {
 
         this.makePostsInfo = this.makePostsInfo.bind(this);
 
+        this.getPost = this.getPost.bind(this);
         this.getAllPosts = this.getAllPosts.bind(this);
         this.getEarliestPost = this.getEarliestPost.bind(this);
         this.getLatestPost = this.getLatestPost.bind(this);
@@ -160,6 +161,17 @@ class PostStoreClass extends EventEmitter {
         }
     }
 
+    getPost(channelId, postId) {
+        const posts = this.postsInfo[channelId].postList;
+        let post = null;
+
+        if (posts.posts.hasOwnProperty(postId)) {
+            post = Object.assign({}, posts.posts[postId]);
+        }
+
+        return post;
+    }
+
     getAllPosts(id) {
         if (this.postsInfo.hasOwnProperty(id)) {
             return Object.assign({}, this.postsInfo[id].postList);
@@ -554,7 +566,7 @@ class PostStoreClass extends EventEmitter {
         return 0;
     }
     getCommentCount(post) {
-        const posts = this.getPosts(post.channel_id).posts;
+        const posts = this.getAllPosts(post.channel_id).posts;
 
         let commentCount = 0;
         for (const id in posts) {
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 2fc63443e..7efe70cb4 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -116,7 +116,7 @@ a:focus, a:hover {
 .btn {
   &.btn-danger {
     color: #fff;
-    &:hover, &:active {
+    &:hover, &:active, &:focus {
       color: #fff;
     }
   }