diff --git a/assets/less/classes/comments.less b/assets/less/classes/comments.less
index bc17018c..b6a9f83a 100644
--- a/assets/less/classes/comments.less
+++ b/assets/less/classes/comments.less
@@ -4,8 +4,12 @@
     word-wrap: break-word;
 
     &__listing {
-        max-height: 600px;
         overflow-y: auto;
+
+        &--limit {
+            --comments-max-height: 600px;
+            max-height: var(--comments-max-height);
+        }
     }
 
     &__input,
diff --git a/assets/typescript/Comments.ts b/assets/typescript/Comments.ts
index 8888d819..6fd16a06 100644
--- a/assets/typescript/Comments.ts
+++ b/assets/typescript/Comments.ts
@@ -10,8 +10,7 @@ function commentsRequestLock(): boolean
     if (commentsLocked())
         return false;
 
-    globalCommentLock = true;
-    return true;
+    return globalCommentLock = true;
 }
 
 function commentsFreeLock(): void
diff --git a/templates/_layout/comments.twig b/templates/_layout/comments.twig
index 30acf04b..94d32ef6 100644
--- a/templates/_layout/comments.twig
+++ b/templates/_layout/comments.twig
@@ -208,14 +208,11 @@
 
     {% if perms.can_comment %}
         <script>
-            var commentPostLock = false;
-
             function commentPost(ev)
             {
                 // the moment we find the id we engage vote lock
-                if (commentPostLock)
+                if (!commentsRequestLock())
                     return;
-                commentPostLock = true;
 
                 var form = ev.target,
                     formData = new FormData;
@@ -237,6 +234,8 @@
                     if (this.readyState !== 4)
                         return;
 
+                    commentsFreeLock();
+
                     var json = JSON.parse(this.responseText),
                         message = json.error || json.message;
 
@@ -247,8 +246,6 @@
                             form.parentNode.parentNode.querySelector('label.comment__action').click();
                         commentInsert(json, form);
                     }
-
-                    commentPostLock = false;
                 };
 
                 xhr.open('POST', '/comments.php?m=create');