diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index afe9784955..09437f8dcd 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -10,9 +10,9 @@ var ActionTypes = Constants.ActionTypes;
 
 module.exports = React.createClass({
     componentDidMount: function() {
-        $('.edit-modal').on('show.bs.modal', function () {
-            $('.edit-modal .edit-modal-body').css('overflow-y', 'auto');
-            $('.edit-modal .edit-modal-body').css('max-height', $(window).height() * 0.7);
+        $('.modal').on('show.bs.modal', function () {
+            $('.modal-body').css('overflow-y', 'auto');
+            $('.modal-body').css('max-height', $(window).height() * 0.7);
         });
     },
     handleCommentClick: function(e) {
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index b26af1d322..5438f58fbc 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -66,7 +66,6 @@
 			}
 		}
 		.btn {
-			margin-right: 10px;
 			&.btn-primary {
 				float: right;
 				margin-top: -4px;