diff --git a/web/react/components/delete_post_modal.jsx b/web/react/components/delete_post_modal.jsx
index 3c4b17905c..5e89a08933 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/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 2fc63443e7..7efe70cb4e 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;
     }
   }