diff --git a/dashboard/src/views/EmailMailboxesView.vue b/dashboard/src/views/EmailMailboxesView.vue
index a9dcc8c22..b6173eae3 100644
--- a/dashboard/src/views/EmailMailboxesView.vue
+++ b/dashboard/src/views/EmailMailboxesView.vue
@@ -203,7 +203,7 @@ onMounted(async () => {
         <Button @click="onAddOrEdit()">{{ $t('email.incoming.mailboxes.addAction') }}</Button>
       </template>
 
-      <TableView :columns="columns" :model="filteredMailboxes" :busy="busy" @row-click="onAddOrEdit">
+      <TableView :columns="columns" :model="filteredMailboxes" :busy="busy">
         <template #aliases="mailbox">{{ renderAliases(mailbox.aliases) }}</template>
         <template #usage="mailbox">
           <span v-if="mailbox.usage">{{ prettyDecimalSize(mailbox.usage.quotaValue)  }} <span ng-show="mailUsage[mailbox.fullName].quotaLimit">/ {{ prettyDecimalSize(mailbox.usage.quotaLimit) }}</span></span>
diff --git a/dashboard/src/views/EmailMailinglistsView.vue b/dashboard/src/views/EmailMailinglistsView.vue
index 613ac4657..37d3387f1 100644
--- a/dashboard/src/views/EmailMailinglistsView.vue
+++ b/dashboard/src/views/EmailMailinglistsView.vue
@@ -131,7 +131,7 @@ onMounted(async () => {
         <Button @click="onAddOrEdit()">{{ $t('email.incoming.mailboxes.addAction') }}</Button>
       </template>
 
-      <TableView :columns="columns" :model="mailinglists" :busy="busy" @row-click="onAddOrEdit">
+      <TableView :columns="columns" :model="mailinglists" :busy="busy">
         <template #membersOnly="mailinglist">
           <i class="fas" :class="{ 'fa-door-closed': mailinglist.membersOnly, 'fa-door-open': !mailinglist.membersOnly }" v-tooltip="$t(mailinglist.membersOnly ? 'email.incoming.mailinglists.everyoneTooltip' : 'email.incoming.mailinglists.membersOnlyTooltip')"></i>
         </template>