diff --git a/app/assets/v2/js/activity.js b/app/assets/v2/js/activity.js
index fae0c88fd67..f05028c3f64 100644
--- a/app/assets/v2/js/activity.js
+++ b/app/assets/v2/js/activity.js
@@ -307,6 +307,7 @@ $(document).ready(function() {
     var comment = $parent.parents('.box').find('.comment_container textarea').val();
 
     $parent.parents('.box').find('.comment_container textarea').prop('disabled', true);
+    $('.post_comment').prop('disabled', true);
 
     // validation
     if (!comment) {
@@ -347,6 +348,7 @@ $(document).ready(function() {
       .always(function() {
         $parent.parents('.activity.box').find('.loading').addClass('hidden');
         $parent.parents('.box').find('.comment_container textarea').prop('disabled', false);
+        $('.post_comment').prop('disabled', false);
       });
   };