diff --git a/app/(app)/lish/[did]/[publication]/[rkey]/Interactions/Comments/index.tsx b/app/(app)/lish/[did]/[publication]/[rkey]/Interactions/Comments/index.tsx
index eeaca3e6..605435d6 100644
--- a/app/(app)/lish/[did]/[publication]/[rkey]/Interactions/Comments/index.tsx
+++ b/app/(app)/lish/[did]/[publication]/[rkey]/Interactions/Comments/index.tsx
@@ -215,16 +215,18 @@ const Replies = (props: {
   return (
     <>
       <div className="flex gap-2 items-center">
-        <button
-          className="flex gap-1 items-center text-sm text-tertiary"
-          onClick={() => {
-            setRepliesOpen(!repliesOpen);
-            setReplyBoxOpen(false);
-          }}
-        >
-          <CommentTiny className="text-border" />{" "}
-          {replies.length !== 0 && replies.length}
-        </button>
+        {(replies.length !== 0 || identity?.atp_did) && (
+          <button
+            className="flex gap-1 items-center text-sm text-tertiary"
+            onClick={() => {
+              setRepliesOpen(!repliesOpen);
+              setReplyBoxOpen(false);
+            }}
+          >
+            <CommentTiny className="text-border" />{" "}
+            {replies.length !== 0 && replies.length}
+          </button>
+        )}
         {identity?.atp_did && (
           <button
             className="text-accent-contrast text-sm"
diff --git a/app/(app)/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx b/app/(app)/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx
index 4e394947..17690e7c 100644
--- a/app/(app)/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx
+++ b/app/(app)/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx
@@ -85,7 +85,16 @@ export function setInteractionState(
       const url = new URL(window.location.href);
       const newDocState = newState[document_uri];
 
-      if (newDocState.drawerOpen && newDocState.drawer) {
+      // The drawer counts as open if drawerOpen is explicitly true, or if it
+      // was opened via the URL (drawerOpen still undefined but the param is
+      // present). This mirrors useDrawerOpen — otherwise updating just the tab
+      // while the drawer is param-opened would delete the param and close it.
+      const drawerCurrentlyOpen =
+        newDocState.drawerOpen === true ||
+        (newDocState.drawerOpen === undefined &&
+          url.searchParams.has("interactionDrawer"));
+
+      if (drawerCurrentlyOpen && newDocState.drawer) {
         url.searchParams.set("interactionDrawer", newDocState.drawer);
       } else {
         url.searchParams.delete("interactionDrawer");
diff --git a/components/DiscussionModal.tsx b/components/DiscussionModal.tsx
index 47df9a46..381a9bea 100644
--- a/components/DiscussionModal.tsx
+++ b/components/DiscussionModal.tsx
@@ -61,7 +61,7 @@ export function DiscussionModal(props: {
     <Modal
       open={props.open}
       onOpenChange={props.onOpenChange}
-      className="px-3! pt-0! pb-4 gap-0 sm:w-lg max-w-full relative bg-[var(--color-bg-light)]!"
+      className="px-3! pt-0! pb-4 gap-0 sm:w-lg max-w-full relative bg-[var(--color-bg-light)]! max-h-full h-[1000px]!"
     >
       <div className="standardSitePostBlock block-border overflow-hidden w-full bg-bg-page my-3">
         <StandardSitePostItem