diff --git a/src/client/components/emoji-picker-dialog.vue b/src/client/components/emoji-picker-dialog.vue
index 3450d219c..4b165d9f9 100644
--- a/src/client/components/emoji-picker-dialog.vue
+++ b/src/client/components/emoji-picker-dialog.vue
@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" :manual-showing="manualShowing" :src="src" @click="$refs.modal.close()" @opening="$refs.picker.focus()" @close="$emit('close')" @closed="$emit('closed')">
+<MkModal ref="modal" :manual-showing="manualShowing" :src="src" @click="$refs.modal.close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')">
 	<MkEmojiPicker :show-pinned="showPinned" :as-reaction-picker="asReactionPicker" @chosen="chosen" ref="picker"/>
 </MkModal>
 </template>
@@ -46,6 +46,11 @@ export default defineComponent({
 			this.$emit('done', emoji);
 			this.$refs.modal.close();
 		},
+
+		opening() {
+			this.$refs.picker.reset();
+			this.$refs.picker.focus();
+		}
 	}
 });
 </script>
diff --git a/src/client/components/emoji-picker.vue b/src/client/components/emoji-picker.vue
index 41e667dd9..7c8221199 100644
--- a/src/client/components/emoji-picker.vue
+++ b/src/client/components/emoji-picker.vue
@@ -282,6 +282,10 @@ export default defineComponent({
 			}
 		},
 
+		reset() {
+			this.$refs.emojis.scrollTop = 0;
+		},
+
 		getKey(emoji: any) {
 			return typeof emoji === 'string' ? emoji : (emoji.char || `:${emoji.name}:`);
 		},