diff --git a/src/app/components/Content.svelte b/src/app/components/Content.svelte
index 64cbbb19e..b4b35991e 100644
--- a/src/app/components/Content.svelte
+++ b/src/app/components/Content.svelte
@@ -152,8 +152,8 @@
         {:else if isEvent(parsed) || isAddress(parsed)}
           {#if isBlock(i)}
             <ContentQuote {...quoteProps} value={parsed.value} {event}>
-              {#snippet noteContent({event}: {event: TrustedEvent})}
-                <Content {quoteProps} {hideMedia} {event} depth={depth + 1} />
+              {#snippet noteContent({event, minimal}: {event: TrustedEvent; minimal: boolean})}
+                <Content {quoteProps} hideMedia={minimal || hideMedia} {event} depth={depth + 1} />
               {/snippet}
             </ContentQuote>
           {:else}
diff --git a/src/app/components/ContentQuote.svelte b/src/app/components/ContentQuote.svelte
index 07afde280..d01c69ed2 100644
--- a/src/app/components/ContentQuote.svelte
+++ b/src/app/components/ContentQuote.svelte
@@ -96,7 +96,7 @@
 <Button class="my-2 block max-w-full text-left" {onclick}>
   {#if $quote}
     <NoteCard {minimal} event={$quote} class="bg-alt rounded-box p-4">
-      {@render noteContent({event: $quote})}
+      {@render noteContent({event: $quote, minimal})}
     </NoteCard>
   {:else}
     <div class="rounded-box p-4">
diff --git a/src/lib/components/EmojiButton.svelte b/src/lib/components/EmojiButton.svelte
index 9108c22f7..4e931f2f3 100644
--- a/src/lib/components/EmojiButton.svelte
+++ b/src/lib/components/EmojiButton.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import {onDestroy} from "svelte"
   import {type Instance} from "tippy.js"
   import type {NativeEmoji} from "emoji-picker-element/shared"
   import {between, throttle} from "@welshman/lib"
@@ -26,6 +27,10 @@
   })
 
   let popover: Instance | undefined = $state()
+
+  onDestroy(() => {
+    popover = undefined
+  })
 </script>
 
 <svelte:document onmousemove={onMouseMove} />