diff --git a/routes/_components/dialog/ComposeDialog.html b/routes/_components/dialog/ComposeDialog.html
index 69250666..8c395874 100644
--- a/routes/_components/dialog/ComposeDialog.html
+++ b/routes/_components/dialog/ComposeDialog.html
@@ -1,4 +1,11 @@
-<ModalDialog :label :shown :closed :title background="var(--main-bg)">
+<ModalDialog
+  :label
+  :shown
+  :closed
+  :title
+  background="var(--main-bg)"
+  on:destroyDialog="destroy()"
+>
   <ComposeBox realm="dialog" size="slim" autoFocus="true" on:postedStatus="onPostedStatus()" />
 </ModalDialog>
 <script>
diff --git a/routes/_components/dialog/ConfirmationDialog.html b/routes/_components/dialog/ConfirmationDialog.html
index 64dd1087..ff72f0d3 100644
--- a/routes/_components/dialog/ConfirmationDialog.html
+++ b/routes/_components/dialog/ConfirmationDialog.html
@@ -1,4 +1,10 @@
-<ModalDialog :label :shown :closed background="var(--main-bg)" on:close="onClose()">
+<ModalDialog
+  :label
+  :shown
+  :closed background="var(--main-bg)"
+  on:close="onClose()"
+  on:destroyDialog="destroy()"
+>
   <form class="confirmation-dialog-form">
     <p>
       {{text}}
diff --git a/routes/_components/dialog/EmojiDialog.html b/routes/_components/dialog/EmojiDialog.html
index c151e5b0..e3be736a 100644
--- a/routes/_components/dialog/EmojiDialog.html
+++ b/routes/_components/dialog/EmojiDialog.html
@@ -1,4 +1,11 @@
-<ModalDialog :label :shown :closed :title background="var(--main-bg)">
+<ModalDialog
+  :label
+  :shown
+  :closed
+  :title
+  background="var(--main-bg)"
+  on:destroyDialog="destroy()"
+>
   <div class="custom-emoji-container">
     {{#if emojis.length}}
       <ul class="custom-emoji-list">
diff --git a/routes/_components/dialog/ImageDialog.html b/routes/_components/dialog/ImageDialog.html
index 31fd59d1..5082dbd6 100644
--- a/routes/_components/dialog/ImageDialog.html
+++ b/routes/_components/dialog/ImageDialog.html
@@ -3,6 +3,7 @@
              background="var(--muted-modal-bg)"
              muted="true"
              className="image-modal-dialog"
+             on:destroyDialog="destroy()"
 >
   {{#if type === 'gifv'}}
     <AutoplayVideo
diff --git a/routes/_components/dialog/ModalDialog.html b/routes/_components/dialog/ModalDialog.html
index d41d6db9..5311a3a1 100644
--- a/routes/_components/dialog/ModalDialog.html
+++ b/routes/_components/dialog/ModalDialog.html
@@ -148,8 +148,9 @@
       a11yDialog.on('hide', () => {
         a11yDialog.destroy()
         this.fire('close')
-        this.destroy()
-        document.body.removeChild(dialogElement)
+        console.log('destroyDialog()')
+        this.fire('destroyDialog')
+        requestAnimationFrame(() => document.body.removeChild(dialogElement))
       })
       this.observe('shown', shown => {
         if (shown) {
diff --git a/routes/_components/dialog/PostPrivacyDialog.html b/routes/_components/dialog/PostPrivacyDialog.html
index bc433ee7..c8a04f76 100644
--- a/routes/_components/dialog/PostPrivacyDialog.html
+++ b/routes/_components/dialog/PostPrivacyDialog.html
@@ -1,4 +1,11 @@
-<ModalDialog :label :shown :closed :title background="var(--main-bg)">
+<ModalDialog
+  :label
+  :shown
+  :closed
+  :title
+  background="var(--main-bg)"
+  on:destroyDialog="destroy()"
+>
   <GenericDialogList :items on:click="onClick(event)" />
 </ModalDialog>
 <script>
diff --git a/routes/_components/dialog/StatusOptionsDialog.html b/routes/_components/dialog/StatusOptionsDialog.html
index 75f5f20c..e8850fca 100644
--- a/routes/_components/dialog/StatusOptionsDialog.html
+++ b/routes/_components/dialog/StatusOptionsDialog.html
@@ -1,4 +1,11 @@
-<ModalDialog :label :shown :closed :title background="var(--main-bg)">
+<ModalDialog
+  :label
+  :shown
+  :closed
+  :title
+  background="var(--main-bg)"
+  on:destroyDialog="destroy()"
+>
   <GenericDialogList :items on:click="onClick(event)"/>
 </ModalDialog>
 <script>
diff --git a/routes/_components/dialog/VideoDialog.html b/routes/_components/dialog/VideoDialog.html
index 8004aa75..245a47ea 100644
--- a/routes/_components/dialog/VideoDialog.html
+++ b/routes/_components/dialog/VideoDialog.html
@@ -1,8 +1,10 @@
-<ModalDialog :label
-             :shown
-             background="var(--muted-modal-bg)"
-             muted="true"
-             className="video-modal-dialog"
+<ModalDialog
+  :label
+  :shown
+  background="var(--muted-modal-bg)"
+  muted="true"
+  className="video-modal-dialog"
+  on:destroyDialog="destroy()"
 >
   <video poster="{{poster}}"
          src="{{src}}"