diff --git a/src/app/components/ChatMessageMenuMobile.svelte b/src/app/components/ChatMessageMenuMobile.svelte
index d4330c85..26d0d061 100644
--- a/src/app/components/ChatMessageMenuMobile.svelte
+++ b/src/app/components/ChatMessageMenuMobile.svelte
@@ -2,17 +2,19 @@
   import type {NativeEmoji} from "emoji-picker-element/shared"
   import type {TrustedEvent} from "@welshman/util"
   import {sendWrapped} from "@welshman/app"
+  import SmileCircle from "@assets/icons/smile-circle.svg?dataurl"
+  import Reply from "@assets/icons/reply-2.svg?dataurl"
+  import Copy from "@assets/icons/copy.svg?dataurl"
+  import Code2 from "@assets/icons/code-2.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
+  import Modal from "@lib/components/Modal.svelte"
+  import ModalBody from "@lib/components/ModalBody.svelte"
   import Button from "@lib/components/Button.svelte"
   import EmojiPicker from "@lib/components/EmojiPicker.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
   import {makeReaction} from "@app/core/commands"
   import {pushModal} from "@app/util/modal"
   import {clip} from "@app/util/toast"
-  import SmileCircle from "@assets/icons/smile-circle.svg?dataurl"
-  import Reply from "@assets/icons/reply-2.svg?dataurl"
-  import Copy from "@assets/icons/copy.svg?dataurl"
-  import Code2 from "@assets/icons/code-2.svg?dataurl"
 
   type Props = {
     pubkeys: string[]
@@ -45,21 +47,23 @@
   const showInfo = () => pushModal(EventInfo, {event}, {replaceState: true})
 </script>
 
-<div class="col-2">
-  <Button class="btn btn-neutral" onclick={showInfo}>
-    <Icon size={4} icon={Code2} />
-    Message Info
-  </Button>
-  <Button class="btn btn-neutral w-full" onclick={copyText}>
-    <Icon size={4} icon={Copy} />
-    Copy Text
-  </Button>
-  <Button class="btn btn-neutral w-full" onclick={sendReply}>
-    <Icon size={4} icon={Reply} />
-    Send Reply
-  </Button>
-  <Button class="btn btn-primary w-full" onclick={showEmojiPicker}>
-    <Icon size={4} icon={SmileCircle} />
-    Send Reaction
-  </Button>
-</div>
+<Modal>
+  <ModalBody>
+    <Button class="btn btn-neutral" onclick={showInfo}>
+      <Icon size={4} icon={Code2} />
+      Message Info
+    </Button>
+    <Button class="btn btn-neutral w-full" onclick={copyText}>
+      <Icon size={4} icon={Copy} />
+      Copy Text
+    </Button>
+    <Button class="btn btn-neutral w-full" onclick={sendReply}>
+      <Icon size={4} icon={Reply} />
+      Send Reply
+    </Button>
+    <Button class="btn btn-primary w-full" onclick={showEmojiPicker}>
+      <Icon size={4} icon={SmileCircle} />
+      Send Reaction
+    </Button>
+  </ModalBody>
+</Modal>
diff --git a/src/app/components/RoomItemMenuMobile.svelte b/src/app/components/RoomItemMenuMobile.svelte
index d017ffb1..b07d0b3e 100644
--- a/src/app/components/RoomItemMenuMobile.svelte
+++ b/src/app/components/RoomItemMenuMobile.svelte
@@ -11,6 +11,8 @@
   import Button from "@lib/components/Button.svelte"
   import Link from "@lib/components/Link.svelte"
   import Icon from "@lib/components/Icon.svelte"
+  import Modal from "@lib/components/Modal.svelte"
+  import ModalBody from "@lib/components/ModalBody.svelte"
   import EmojiPicker from "@lib/components/EmojiPicker.svelte"
   import ZapButton from "@app/components/ZapButton.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
@@ -54,35 +56,37 @@
   const showDelete = () => pushModal(EventDeleteConfirm, {url, event})
 </script>
 
-<div class="flex flex-col gap-2">
-  {#if event.pubkey === $pubkey}
-    <Button class="btn btn-neutral text-error" onclick={showDelete}>
-      <Icon size={4} icon={TrashBin2} />
-      Delete Message
+<Modal>
+  <ModalBody>
+    {#if event.pubkey === $pubkey}
+      <Button class="btn btn-neutral text-error" onclick={showDelete}>
+        <Icon size={4} icon={TrashBin2} />
+        Delete Message
+      </Button>
+    {/if}
+    <Button class="btn btn-neutral" onclick={showInfo}>
+      <Icon size={4} icon={Code2} />
+      Message Info
     </Button>
-  {/if}
-  <Button class="btn btn-neutral" onclick={showInfo}>
-    <Icon size={4} icon={Code2} />
-    Message Info
-  </Button>
-  {#if path}
-    <Link class="btn btn-neutral" href={path}>
-      <Icon size={4} icon={MenuDots} />
-      View Details
-    </Link>
-  {/if}
-  {#if ENABLE_ZAPS}
-    <ZapButton replaceState {url} {event} class="btn btn-neutral w-full">
-      <Icon size={4} icon={Bolt} />
-      Send Zap
-    </ZapButton>
-  {/if}
-  <Button class="btn btn-neutral w-full" onclick={sendReply}>
-    <Icon size={4} icon={Reply} />
-    Send Reply
-  </Button>
-  <Button class="btn btn-neutral w-full" onclick={showEmojiPicker}>
-    <Icon size={4} icon={SmileCircle} />
-    Send Reaction
-  </Button>
-</div>
+    {#if path}
+      <Link class="btn btn-neutral" href={path}>
+        <Icon size={4} icon={MenuDots} />
+        View Details
+      </Link>
+    {/if}
+    {#if ENABLE_ZAPS}
+      <ZapButton replaceState {url} {event} class="btn btn-neutral w-full">
+        <Icon size={4} icon={Bolt} />
+        Send Zap
+      </ZapButton>
+    {/if}
+    <Button class="btn btn-neutral w-full" onclick={sendReply}>
+      <Icon size={4} icon={Reply} />
+      Send Reply
+    </Button>
+    <Button class="btn btn-neutral w-full" onclick={showEmojiPicker}>
+      <Icon size={4} icon={SmileCircle} />
+      Send Reaction
+    </Button>
+  </ModalBody>
+</Modal>
diff --git a/src/lib/components/ModalBody.svelte b/src/lib/components/ModalBody.svelte
index 85c67ea8..77e00927 100644
--- a/src/lib/components/ModalBody.svelte
+++ b/src/lib/components/ModalBody.svelte
@@ -10,6 +10,6 @@
   const {children, ...props}: Props = $props()
 </script>
 
-<div class={cx("scroll-container overflow-y-auto min-h-0 flex flex-col gap-4 p-6", props.class)}>
+<div class={cx("scroll-container overflow-y-auto min-h-0 flex flex-col gap-2 p-6", props.class)}>
   {@render children?.()}
 </div>