diff --git a/frontend/src/app/main/ui/comments.cljs b/frontend/src/app/main/ui/comments.cljs
index d5d7d5ca5..c14c55048 100644
--- a/frontend/src/app/main/ui/comments.cljs
+++ b/frontend/src/app/main/ui/comments.cljs
@@ -996,7 +996,7 @@
               :id (str "thread-" thread-id)
               :style {:left (str pos-x "px")
                       :top (str pos-y "px")
-                      :max-height max-height}
+                      "--comment-height" (str max-height "px")}
               :on-click dom/stop-propagation}
 
         [:div {:class (stl/css :floating-thread-header)}
diff --git a/frontend/src/app/main/ui/comments.scss b/frontend/src/app/main/ui/comments.scss
index f6e2a37be..4fc6470b9 100644
--- a/frontend/src/app/main/ui/comments.scss
+++ b/frontend/src/app/main/ui/comments.scss
@@ -152,6 +152,7 @@
   border-radius: $br-8;
   border: $s-2 solid var(--modal-border-color);
   background-color: var(--comment-modal-background-color);
+  max-height: var(--comment-height);
   --translate-x: 0%;
   --translate-y: 0%;
   transform: translate(var(--translate-x), var(--translate-y));
@@ -229,6 +230,8 @@
   display: flex;
   flex-direction: column;
   gap: $s-8;
+  max-height: calc(var(--comment-height) - $s-132);
+
   textarea {
     @extend .input-element;
     @include bodySmallTypography;