diff --git a/src/components/CommentCard.tsx b/src/components/CommentCard.tsx
index 2eb7048..3a6c60f 100644
--- a/src/components/CommentCard.tsx
+++ b/src/components/CommentCard.tsx
@@ -24,7 +24,7 @@ const CommentCard: Component<{ content: ReactiveComment; rootId: string }> = (pr
   const { locale, commentClassName } = configProvider;
   const time = createMemo(() => getTimeAgo(new Date(props.content.time), now(), locale()));
   return (
-    <div id={props.content.objectId} class="sds-comment flex p-2 pe-0">
+    <div id={props.content.objectId} class="sds-comment flex flex-shrink-0 p-2 pe-0">
       <div aria-hidden class="me-3 relative">
         <Show when={props.content.avatar}>
           <img src={props.content.avatar} alt={props.content.nick} class="sds-avatar" />
diff --git a/src/controllers/commentBoxState.ts b/src/controllers/commentBoxState.ts
index 26a4187..7c4fb8b 100644
--- a/src/controllers/commentBoxState.ts
+++ b/src/controllers/commentBoxState.ts
@@ -186,6 +186,7 @@ export const submitComment = () => {
         target.setComment(resComment.comment);
         if (resComment.orig) target.setOrig(resComment.orig);
         setEdit(null);
+        clearReplyState();
       } else if (resComment.rid) {
         const target = data().find((item) => item.objectId === resComment.rid);
         if (!target) return null;