diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue
index b63d70bc2..53daab26a 100644
--- a/packages/client/src/components/MkEmojiPicker.vue
+++ b/packages/client/src/components/MkEmojiPicker.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
 	<input ref="search" v-model.trim="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @paste.stop="paste" @keyup.enter="done()">
-	<MkSwitch v-model="withRenote">{{ i18n.ts.reactWithRenote }}</MkSwitch>
+	<MkSwitch v-if="props.asReactionPicker" v-model="withRenote" class="withRenote">{{ i18n.ts.reactWithRenote }}</MkSwitch>
 	<div ref="emojis" class="emojis">
 		<section class="result">
 			<div v-if="searchResultCustom.length > 0" class="body">
@@ -281,6 +281,7 @@ function focus() {
 function reset() {
 	if (emojis.value) emojis.value.scrollTop = 0;
 	q.value = '';
+	withRenote.value = false; // 毎回Renoteをfalseに戻す
 }
 
 function getKey(emoji: string | Misskey.entities.CustomEmoji | UnicodeEmojiDef): string {
@@ -455,8 +456,8 @@ defineExpose({
 		}
 	}
 
-	> .renote {
-		width: 100%;
+	> .withRenote {
+		order: 1;
 	}
 
 	> .tabs {
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index e0aa49a70..0f6909fe5 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -212,7 +212,6 @@ function react(viaKeyboard = false): void {
 			noteId: appearNote.id,
 			reaction: results.reaction,
 		});
-		console.log(results)
 		if (results.withRenote) {
 			os.api('notes/create', {
 				renoteId: appearNote.id,