diff --git a/package-lock.json b/package-lock.json
index 1f7d3870..20e74036 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "imwald",
-  "version": "23.17.2",
+  "version": "23.17.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "imwald",
-      "version": "23.17.2",
+      "version": "23.17.3",
       "license": "MIT",
       "dependencies": {
         "@asciidoctor/core": "^3.0.4",
diff --git a/package.json b/package.json
index fb51bb56..fa4e8217 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "imwald",
-  "version": "23.17.2",
+  "version": "23.17.3",
   "description": "Imwald — a user-friendly Nostr client focused on relay feed browsing, publications, and relay discovery",
   "private": true,
   "type": "module",
diff --git a/src/components/EmojiPicker/index.tsx b/src/components/EmojiPicker/index.tsx
index ed3fb254..eebef265 100644
--- a/src/components/EmojiPicker/index.tsx
+++ b/src/components/EmojiPicker/index.tsx
@@ -134,9 +134,31 @@ export default function EmojiPicker({
 
   const reactionsList = reactions ?? [...DEFAULT_SUGGESTED_EMOJIS]
 
+  const ownEmojisRow =
+    ownEmojis.length > 0 ? (
+      <div className="flex shrink-0 items-center gap-0.5 px-1 py-1 border-b overflow-x-auto scrollbar-hide">
+        {ownEmojis.map((emoji) => (
+          <button
+            key={emoji.shortcode}
+            type="button"
+            title={`:${emoji.shortcode}:`}
+            className="shrink-0 w-8 h-8 rounded hover:bg-muted flex items-center justify-center"
+            onClick={(e) => {
+              recordEmojiUsed(emoji)
+              onEmojiClick(emoji, e.nativeEvent)
+            }}
+          >
+            <img src={emoji.url} alt={emoji.shortcode} className="w-6 h-6 object-contain" />
+          </button>
+        ))}
+      </div>
+    ) : null
+
   if (mode === 'reactions') {
     return (
-      <div className="flex flex-wrap items-center gap-1 p-2">
+      <div className="flex w-full min-w-0 flex-col">
+        {ownEmojisRow}
+        <div className="flex flex-wrap items-center gap-1 p-2">
         {reactionsList.map((emoji) => (
           <button
             key={emoji}
@@ -158,31 +180,15 @@ export default function EmojiPicker({
         >
           <Plus size={20} />
         </button>
+        </div>
       </div>
     )
   }
 
   return (
-    <div className="w-full flex flex-col">
-      {ownEmojis.length > 0 && (
-        <div className="flex items-center gap-0.5 px-1 py-1 border-b overflow-x-auto scrollbar-hide">
-          {ownEmojis.map((emoji) => (
-            <button
-              key={emoji.shortcode}
-              type="button"
-              title={`:${emoji.shortcode}:`}
-              className="shrink-0 w-8 h-8 rounded hover:bg-muted flex items-center justify-center"
-              onClick={(e) => {
-                recordEmojiUsed(emoji)
-                onEmojiClick(emoji, e.nativeEvent)
-              }}
-            >
-              <img src={emoji.url} alt={emoji.shortcode} className="w-6 h-6 object-contain" />
-            </button>
-          ))}
-        </div>
-      )}
-      <div ref={containerRef} />
+    <div className="flex w-full min-w-0 flex-col">
+      {ownEmojisRow}
+      <div ref={containerRef} className="min-h-0 w-full flex-1 overflow-hidden" />
     </div>
   )
 }
diff --git a/src/components/EmojiPickerDialog/index.tsx b/src/components/EmojiPickerDialog/index.tsx
index 8766b5ae..a337696f 100644
--- a/src/components/EmojiPickerDialog/index.tsx
+++ b/src/components/EmojiPickerDialog/index.tsx
@@ -39,14 +39,16 @@ export default function EmojiPickerDialog({
           <DrawerHeader className="sr-only">
             <DrawerTitle>Emoji Picker</DrawerTitle>
           </DrawerHeader>
-          <div className="flex w-full max-w-[100vw] min-w-0 min-h-0 shrink flex-col items-stretch overflow-x-hidden pb-1">
-            <EmojiPicker
-              onEmojiClick={(emoji, e) => {
-                e.stopPropagation()
-                setOpen(false)
-                onEmojiClick?.(emoji)
-              }}
-            />
+          <div className="flex w-full max-w-[100vw] min-w-0 min-h-0 max-h-[min(72dvh,calc(100dvh-6rem))] flex-col overflow-hidden pb-1">
+            {open ? (
+              <EmojiPicker
+                onEmojiClick={(emoji, e) => {
+                  e.stopPropagation()
+                  setOpen(false)
+                  onEmojiClick?.(emoji)
+                }}
+              />
+            ) : null}
           </div>
         </DrawerContent>
       </Drawer>
diff --git a/src/components/NoteStats/LikeButton.tsx b/src/components/NoteStats/LikeButton.tsx
index ac40f6ef..89486aae 100644
--- a/src/components/NoteStats/LikeButton.tsx
+++ b/src/components/NoteStats/LikeButton.tsx
@@ -340,6 +340,7 @@ export function LikeButtonWithStats({
         <Drawer handleOnly open={isEmojiReactionsOpen} onOpenChange={setIsEmojiReactionsOpen}>
           <DrawerContent
             dragHandle="vaul"
+            className="max-h-[min(88dvh,calc(100dvh-5rem))]"
             onPointerDownOutside={(e) => {
               const t = e.target as HTMLElement | null
               if (t?.closest?.('[data-vaul-overlay]')) return
@@ -349,7 +350,9 @@ export function LikeButtonWithStats({
             <DrawerHeader className="sr-only">
               <DrawerTitle>React</DrawerTitle>
             </DrawerHeader>
-            {likeEmojiPicker}
+            <div className="flex min-h-0 w-full max-h-[min(72dvh,calc(100dvh-6rem))] flex-col overflow-hidden px-1 pb-1">
+              {isEmojiReactionsOpen ? likeEmojiPicker : null}
+            </div>
           </DrawerContent>
         </Drawer>
       </>