diff --git a/addons/web/static/src/core/emoji_picker/emoji_picker.js b/addons/web/static/src/core/emoji_picker/emoji_picker.js
index aaeddd1b0e1..a2fb48b7d8a 100644
--- a/addons/web/static/src/core/emoji_picker/emoji_picker.js
+++ b/addons/web/static/src/core/emoji_picker/emoji_picker.js
@@ -303,8 +303,8 @@ export class EmojiPicker extends Component {
         this.state.recent[codepoints] ??= 0;
         this.state.recent[codepoints]++;
         browser.localStorage.setItem("web.emoji.frequent", JSON.stringify(this.state.recent));
-        this.gridRef.el.scrollTop = 0;
         if (!ev.shiftKey) {
+            this.gridRef.el.scrollTop = 0;
             this.props.close?.();
             this.props.onClose?.();
         }