diff --git a/src/components/ui/emoji-selector.tsx b/src/components/ui/emoji-selector.tsx
index 32303800f..ba06887bb 100644
--- a/src/components/ui/emoji-selector.tsx
+++ b/src/components/ui/emoji-selector.tsx
@@ -7,8 +7,10 @@ import { closeModal, openModal } from 'soapbox/actions/modals.ts';
 import EmojiComponent from 'soapbox/components/ui/emoji.tsx';
 import HStack from 'soapbox/components/ui/hstack.tsx';
 import IconButton from 'soapbox/components/ui/icon-button.tsx';
-import EmojiPickerDropdown from 'soapbox/features/emoji/components/emoji-picker-dropdown.tsx';
+import EmojiPickerDropdown, { getFrequentlyUsedEmojis } from 'soapbox/features/emoji/components/emoji-picker-dropdown.tsx';
+import emojiData from 'soapbox/features/emoji/data.ts';
 import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts';
+import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts';
 import { useClickOutside } from 'soapbox/hooks/useClickOutside.ts';
 import { useFeatures } from 'soapbox/hooks/useFeatures.ts';
 import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts';
@@ -67,8 +69,9 @@ const EmojiSelector: React.FC<IEmojiSelector> = ({
   offsetOptions,
   all = true,
 }): JSX.Element => {
-  const soapboxConfig = useSoapboxConfig();
+  const { allowedEmoji } = useSoapboxConfig();
   const { customEmojiReacts } = useFeatures();
+  const shortcodes = useAppSelector((state) => getFrequentlyUsedEmojis(state));
 
   const dispatch = useAppDispatch();
   const [expanded, setExpanded] = useState(false);
@@ -113,6 +116,16 @@ const EmojiSelector: React.FC<IEmojiSelector> = ({
     onClose?.();
   });
 
+  const recentEmojis = shortcodes.reduce<string[]>((results, shortcode) => {
+    const emoji = emojiData.emojis[shortcode]?.skins[0]?.native;
+    if (emoji) {
+      results.push(emoji);
+    }
+    return results;
+  }, []);
+
+  const emojis = new Set([...recentEmojis, ...allowedEmoji]);
+
   return (
     <div
       className={clsx('z-[101] transition-opacity duration-100', {
@@ -138,7 +151,7 @@ const EmojiSelector: React.FC<IEmojiSelector> = ({
         <HStack
           className={clsx('z-[999] flex w-max max-w-[100vw] flex-wrap space-x-3 rounded-full bg-white px-3 py-2.5 shadow-lg focus:outline-none dark:bg-gray-900 dark:ring-2 dark:ring-primary-700')}
         >
-          {Array.from(soapboxConfig.allowedEmoji).map((emoji, i) => (
+          {[...emojis].slice(0, 6).map((emoji, i) => (
             <EmojiButton
               key={i}
               emoji={emoji}