diff --git a/public/s/css/f0ckm.css b/public/s/css/f0ckm.css
index fb78005..936e718 100644
--- a/public/s/css/f0ckm.css
+++ b/public/s/css/f0ckm.css
@@ -2352,12 +2352,33 @@ body.layout-modern .item-sidebar-left .tag-controls {
   position: relative;
 }
 
+.submit-comment .submit-spinner {
+  display: none;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  margin: 0;
+}
+
+.submit-comment .submit-label {
+  display: inline;
+}
+
 .submit-comment.loading {
   pointer-events: none;
   opacity: 0.7;
   cursor: wait;
 }
 
+.submit-comment.loading .submit-label {
+  visibility: hidden;
+}
+
+.submit-comment.loading .submit-spinner {
+  display: inline;
+}
+
 .submit-comment.uploading {
   pointer-events: none;
   opacity: 0.5;
@@ -3150,7 +3171,7 @@ body.layout-legacy .scroll-to-bottom svg {
   }
 }
 
-.loading,
+.loading:not(.submit-comment),
 .error {
   text-align: center;
   color: #888;
@@ -7637,7 +7658,7 @@ video.autoplay-gif {
   margin-bottom: 10px;
 }
 
-.loading,
+.loading:not(.submit-comment),
 .error {
   text-align: center;
   padding: 20px;
diff --git a/public/s/js/comments.js b/public/s/js/comments.js
index 22ed30c..b4e5a20 100644
--- a/public/s/js/comments.js
+++ b/public/s/js/comments.js
@@ -2116,7 +2116,7 @@ class CommentSystem {
                     ${counter}
                     ${attachBtn}
                     ${parentId ? `<button class="cancel-reply" title="${cancelLabel}"><i class="fa-solid fa-xmark"></i></button>` : ''}
-                    <button class="submit-comment"><span class="submit-label">${postLabel}</span></button>
+                    <button class="submit-comment"><span class="submit-label">${postLabel}</span><i class="fa-solid fa-spinner fa-spin submit-spinner"></i></button>
                 </div>
             </div>
         `;
@@ -2476,7 +2476,7 @@ class CommentSystem {
             }
 
             // Submit Comment
-            if (target.matches('.submit-comment')) {
+            if (target.closest('.submit-comment')) {
                 this.handleSubmit(e);
                 return;
             }