diff --git a/client/components/app/BookShelfRow.vue b/client/components/app/BookShelfRow.vue
index 082f9fe3..fac89a70 100644
--- a/client/components/app/BookShelfRow.vue
+++ b/client/components/app/BookShelfRow.vue
@@ -93,10 +93,10 @@ export default {
     editAuthor(author) {
       this.$store.commit('globals/showEditAuthorModal', author)
     },
-    editItem(libraryItem) {
+    editItem(libraryItem, tab = 'details') {
       var itemIds = this.shelf.entities.map((e) => e.id)
       this.$store.commit('setBookshelfBookIds', itemIds)
-      this.$store.commit('showEditModal', libraryItem)
+      this.$store.commit('showEditModalOnTab', { libraryItem, tab: tab || 'details' })
     },
     editEpisode({ libraryItem, episode }) {
       this.$store.commit('setEpisodeTableEpisodeIds', [episode.id])
diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue
index 854b61b2..4c72d0d7 100644
--- a/client/components/app/LazyBookshelf.vue
+++ b/client/components/app/LazyBookshelf.vue
@@ -232,11 +232,11 @@ export default {
     clearFilter() {
       this.$store.dispatch('user/updateUserSettings', { filterBy: 'all' })
     },
-    editEntity(entity) {
+    editEntity(entity, tab = 'details') {
       if (this.entityName === 'items' || this.entityName === 'series-books') {
         const bookIds = this.entities.map((e) => e.id)
         this.$store.commit('setBookshelfBookIds', bookIds)
-        this.$store.commit('showEditModal', entity)
+        this.$store.commit('showEditModalOnTab', { libraryItem: entity, tab: tab || 'details' })
       } else if (this.entityName === 'collections') {
         this.$store.commit('globals/setEditCollection', entity)
       } else if (this.entityName === 'playlists') {
diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue
index fbb50bb1..d06f083b 100644
--- a/client/components/cards/LazyBookCard.vue
+++ b/client/components/cards/LazyBookCard.vue
@@ -788,11 +788,11 @@ export default {
     },
     showEditModalFiles() {
       // More menu func
-      this.store.commit('showEditModalOnTab', { libraryItem: this.libraryItem, tab: 'files' })
+      this.$emit('edit', this.libraryItem, 'files')
     },
     showEditModalMatch() {
       // More menu func
-      this.store.commit('showEditModalOnTab', { libraryItem: this.libraryItem, tab: 'match' })
+      this.$emit('edit', this.libraryItem, 'match')
     },
     sendToDevice(deviceName) {
       // More menu func
diff --git a/client/components/widgets/ItemSlider.vue b/client/components/widgets/ItemSlider.vue
index 880654a4..5b96e51b 100644
--- a/client/components/widgets/ItemSlider.vue
+++ b/client/components/widgets/ItemSlider.vue
@@ -132,10 +132,10 @@ export default {
     editAuthor(author) {
       this.$store.commit('globals/showEditAuthorModal', author)
     },
-    editItem(libraryItem) {
+    editItem(libraryItem, tab = 'details') {
       var itemIds = this.items.map((e) => e.id)
       this.$store.commit('setBookshelfBookIds', itemIds)
-      this.$store.commit('showEditModal', libraryItem)
+      this.$store.commit('showEditModalOnTab', { libraryItem, tab: tab || 'details' })
     },
     selectItem(payload) {
       this.$emit('selectEntity', payload)
diff --git a/client/mixins/bookshelfCardsHelpers.js b/client/mixins/bookshelfCardsHelpers.js
index fc8a4125..f1571f70 100644
--- a/client/mixins/bookshelfCardsHelpers.js
+++ b/client/mixins/bookshelfCardsHelpers.js
@@ -118,8 +118,8 @@ export default {
         propsData: props,
         parent: this,
         created() {
-          this.$on('edit', (entity) => {
-            if (_this.editEntity) _this.editEntity(entity)
+          this.$on('edit', (entity, tab) => {
+            if (_this.editEntity) _this.editEntity(entity, tab)
           })
           this.$on('select', ({ entity, shiftKey }) => {
             if (_this.selectEntity) _this.selectEntity(entity, shiftKey)