diff --git a/app/scenes/Document/components/CommentForm.tsx b/app/scenes/Document/components/CommentForm.tsx
index 7e9c46230..45d5f16b8 100644
--- a/app/scenes/Document/components/CommentForm.tsx
+++ b/app/scenes/Document/components/CommentForm.tsx
@@ -198,11 +198,11 @@ function CommentForm({
     ? {
         initial: {
           opacity: 0,
-          translateY: 100,
+          marginBottom: -100,
         },
         animate: {
           opacity: 1,
-          translateY: 0,
+          marginBottom: 0,
           transition: {
             type: "spring",
             bounce: 0.1,
@@ -210,7 +210,7 @@ function CommentForm({
         },
         exit: {
           opacity: 0,
-          translateY: 100,
+          marginBottom: -100,
           scale: 0.98,
         },
       }
@@ -251,7 +251,6 @@ function CommentForm({
                 : `${t("Add a reply")}…`)
             }
           />
-
           {inputFocused && (
             <Flex justify={dir === "rtl" ? "flex-end" : "flex-start"} gap={8}>
               <ButtonSmall type="submit" borderOnHover>
diff --git a/app/scenes/Document/components/Comments.tsx b/app/scenes/Document/components/Comments.tsx
index 158650adb..194ed6905 100644
--- a/app/scenes/Document/components/Comments.tsx
+++ b/app/scenes/Document/components/Comments.tsx
@@ -40,7 +40,7 @@ function Comments() {
       onClose={ui.collapseComments}
       scrollable={false}
     >
-      <Scrollable hiddenScrollbars topShadow bottomShadow>
+      <Scrollable bottomShadow={!focusedComment} hiddenScrollbars topShadow>
         <Wrapper $hasComments={hasComments}>
           {hasComments ? (
             threads.map((thread) => (