diff --git a/frontend/src/components/prompts/Delete.vue b/frontend/src/components/prompts/Delete.vue
index 67cbb33e..89d5fe3a 100644
--- a/frontend/src/components/prompts/Delete.vue
+++ b/frontend/src/components/prompts/Delete.vue
@@ -26,7 +26,7 @@ export default {
   name: 'delete',
   computed: {
     ...mapGetters(['isListing', 'selectedCount']),
-    ...mapState(['req', 'selected'])
+    ...mapState(['req', 'selected', 'showConfirm'])
   },
   methods: {
     ...mapMutations(['closeHovers']),
@@ -38,7 +38,7 @@ export default {
           await api.remove(this.$route.path)
           buttons.success('delete')
 
-          this.$root.$emit('preview-deleted')
+          this.showConfirm()
           this.closeHovers()
           return
         }
diff --git a/frontend/src/components/prompts/ShareDelete.vue b/frontend/src/components/prompts/ShareDelete.vue
index c927f104..3e195225 100644
--- a/frontend/src/components/prompts/ShareDelete.vue
+++ b/frontend/src/components/prompts/ShareDelete.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="card floating">
     <div class="card-content">
-      <p>{{ $t('prompts.deleteMessageShare', {path: hash.path}) }}</p>
+      <p>{{ $t('prompts.deleteMessageShare', {path: ''}) }}</p>
     </div>
     <div class="card-action">
       <button @click="$store.commit('closeHovers')"
@@ -17,30 +17,16 @@
 </template>
 
 <script>
-import {mapMutations, mapState} from 'vuex'
-import { share as api } from '@/api'
-import buttons from '@/utils/buttons'
+import {mapState} from 'vuex'
 
 export default {
   name: 'share-delete',
   computed: {
-    ...mapState(['hash'])
+    ...mapState(['showConfirm'])
   },
   methods: {
-    ...mapMutations(['closeHovers']),
-    submit: async function () {
-      buttons.loading('delete')
-
-      try {
-        await api.remove(this.hash.hash)
-        buttons.success('delete')
-
-        this.$root.$emit('share-deleted', this.hash.hash)
-        this.closeHovers()
-      } catch (e) {
-        buttons.done('delete')
-        this.$showError(e)
-      }
+    submit: function () {
+      this.showConfirm()
     }
   }
 }
diff --git a/frontend/src/views/files/Preview.vue b/frontend/src/views/files/Preview.vue
index e76e769c..21cb8ccd 100644
--- a/frontend/src/views/files/Preview.vue
+++ b/frontend/src/views/files/Preview.vue
@@ -7,7 +7,7 @@
 
       <template #actions>
         <action :disabled="loading" icon="mode_edit" :label="$t('buttons.rename')" show="rename" />
-        <action :disabled="loading" icon="delete" :label="$t('buttons.delete')" show="delete" />
+        <action :disabled="loading" icon="delete" :label="$t('buttons.delete')" @action="deleteFile" id="delete-button" />
         <action :disabled="loading" icon="file_download" :label="$t('buttons.download')" @action="download" />
         <action :disabled="loading" icon="info" :label="$t('buttons.info')" show="info" />
       </template>
@@ -126,24 +126,27 @@ export default {
   async mounted () {
     window.addEventListener('keydown', this.key)
     this.listing = this.oldReq.items
-    this.$root.$on('preview-deleted', this.deleted)
     this.updatePreview()
   },
   beforeDestroy () {
     window.removeEventListener('keydown', this.key)
-    this.$root.$off('preview-deleted', this.deleted)
   },
   methods: {
-    deleted () {
-      this.listing = this.listing.filter(item => item.name !== this.name)
+    deleteFile () {
+      this.$store.commit('showHover', {
+        prompt: 'delete',
+        confirm: () => {
+          this.listing = this.listing.filter(item => item.name !== this.name)
 
-      if (this.hasNext) {
-        this.next()
-      } else if (!this.hasPrevious && !this.hasNext) {
-        this.close()
-      } else {
-        this.prev()
-      }
+          if (this.hasNext) {
+            this.next()
+          } else if (!this.hasPrevious && !this.hasNext) {
+            this.close()
+          } else {
+            this.prev()
+          }
+        }
+      })
     },
     prev () {
       this.hoverNav = false
diff --git a/frontend/src/views/settings/Shares.vue b/frontend/src/views/settings/Shares.vue
index f1fd31d2..030a9906 100644
--- a/frontend/src/views/settings/Shares.vue
+++ b/frontend/src/views/settings/Shares.vue
@@ -77,23 +77,23 @@ export default {
     this.clip.on('success', () => {
       this.$showSuccess(this.$t('success.linkCopied'))
     })
-    this.$root.$on('share-deleted', this.deleted)
   },
   beforeDestroy () {
     this.clip.destroy()
-    this.$root.$off('share-deleted', this.deleted)
   },
   methods: {
     deleteLink: async function (event, link) {
       event.preventDefault()
-      this.$store.commit('setHash', {
-        hash: link.hash,
-        path: link.path
+
+      this.$store.commit('showHover', {
+        prompt: 'share-delete',
+        confirm: () => {
+          this.$store.commit('closeHovers')
+
+          api.remove(link.hash)
+          this.links = this.links.filter(item => item.hash !== link.hash)
+        }
       })
-      this.$store.commit('showHover', 'share-delete')
-    },
-    deleted (hash) {
-      this.links = this.links.filter(item => item.hash !== hash)
     },
     humanTime (time) {
       return moment(time * 1000).fromNow()