diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index bffdd485f5..495021ea88 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -16,7 +16,13 @@
 			:note="appearNote.reply"
 			class="reply-to"
 		/>
-		<div v-if="!detailedView" class="note-context" @click="noteClick" :class="{ collapsedReply }">
+		<div v-if="!detailedView" 
+			class="note-context"
+			@click="noteClick"
+			:class="{ 
+				collapsedReply: collapsedReply && appearNote.reply 
+			}"
+		>
 			<div class="line"></div>
 			<div v-if="appearNote._prId_" class="info">
 				<i class="ph-megaphone-simple-bold ph-lg"></i>
diff --git a/packages/client/src/components/MkPopupMenu.vue b/packages/client/src/components/MkPopupMenu.vue
index a478007271..12a18221cd 100644
--- a/packages/client/src/components/MkPopupMenu.vue
+++ b/packages/client/src/components/MkPopupMenu.vue
@@ -5,7 +5,7 @@
 		:z-priority="'high'"
 		:src="src"
 		:transparent-bg="true"
-		@click="modal.close()"
+		@click="modal?.close()"
 		@closed="emit('closed')"
 		tabindex="-1"
 	>
@@ -18,7 +18,7 @@
 			class="sfhdhdhq"
 			:class="{ drawer: type === 'drawer' }"
 			:no-return-focus="noReturnFocus"
-			@close="modal.close()"
+			@close="modal?.close()"
 		/>
 	</MkModal>
 </template>