diff --git a/src/modules/navigation/partials/NavigationTableItem.vue b/src/modules/navigation/partials/NavigationTableItem.vue
index 6b523a31a..0e18c7984 100644
--- a/src/modules/navigation/partials/NavigationTableItem.vue
+++ b/src/modules/navigation/partials/NavigationTableItem.vue
@@ -15,12 +15,11 @@
 				<Table :size="20" />
 			</template>
 		</template>
-		<template #extra />
 		<template #counter>
 			<NcCounterBubble v-if="canReadData(table)">
 				{{ n('tables', '%n row', '%n rows', table.rowsCount, {}) }}
 			</NcCounterBubble>
-			<NcActionButton v-if="table.hasShares" icon="icon-share" :class="{'margin-right': !(activeTable && table.id === activeTable.id)}" @click="actionShowShare" />
+			<NcActionButton v-if="!isSharedItem" icon="icon-share" :class="{'margin-right': !(activeTable && table.id === activeTable.id)}" @click="actionShowShare" />
 			<div v-if="table.isShared && table.ownership !== userId" class="margin-left">
 				<NcAvatar :user="table.ownership" />
 			</div>
@@ -74,7 +73,8 @@
 		</template>
 		<NavigationViewItem v-for="view in getViews"
 			:key="'view'+view.id"
-			:view="view" />
+			:view="view"
+			:is-shared-item="true" />
 	</NcAppNavigationItem>
 </template>
 <script>
@@ -128,6 +128,10 @@ export default {
 			type: String,
 			default: '',
 		},
+		isSharedItem: {
+		      type: Boolean,
+		      default: false,
+		    },
 	},
 
 	data() {
diff --git a/src/modules/navigation/partials/NavigationViewItem.vue b/src/modules/navigation/partials/NavigationViewItem.vue
index 38195d9f2..855dc5404 100644
--- a/src/modules/navigation/partials/NavigationViewItem.vue
+++ b/src/modules/navigation/partials/NavigationViewItem.vue
@@ -12,12 +12,11 @@
 				<Table :size="20" />
 			</template>
 		</template>
-		<template #extra />
 		<template #counter>
 			<NcCounterBubble v-if="canReadData(view)">
 				{{ n('tables', '%n row', '%n rows', view.rowsCount, {}) }}
 			</NcCounterBubble>
-			<NcActionButton v-if="view.hasShares" icon="icon-share" :class="{'margin-right': !(activeView && view.id === activeView.id)}" @click="actionShowShare" />
+			<NcActionButton v-if="!isSharedItem" icon="icon-share" :class="{'margin-right': !(activeView && view.id === activeView.id)}" @click="actionShowShare" />
 			<div v-if="view.isShared && view.ownership !== userId && !canManageTable(view)" class="margin-left">
 				<NcAvatar :user="view.ownership" />
 			</div>
@@ -117,6 +116,10 @@ export default {
 			type: Object,
 			default: null,
 		},
+		isSharedItem: {
+			type: Boolean,
+			default: false,
+		},
 	},
 
 	data() {
diff --git a/src/modules/navigation/sections/Navigation.vue b/src/modules/navigation/sections/Navigation.vue
index 2f35b0f6b..8d1edba90 100644
--- a/src/modules/navigation/sections/Navigation.vue
+++ b/src/modules/navigation/sections/Navigation.vue
@@ -19,26 +19,23 @@
 						<NcActionButton :aria-label="t('tables', 'Create table')" icon="icon-add" @click.prevent="createTable" />
 					</template>
 				</NcAppNavigationCaption>
-				<NavigationDashboardItem v-for="table in getOwnTables"
+				<NavigationTableItem v-for="table in getOwnTables"
 					:key="table.id"
 					:filter-string="filterString"
 					:table="table" />
 
 				<NcAppNavigationCaption v-if="getSharedTables.length > 0"
-					:title="t('tables', 'Shared tables')" />
-
-				<NavigationDashboardItem v-for="table in getSharedTables"
+					:title="t('tables', 'Shared')" />
+				<NavigationTableItem v-for="table in getSharedTables"
 					:key="table.id"
 					:filter-string="filterString"
-					:table="table" />
-
-				<NcAppNavigationCaption v-if="getSharedViews.length > 0"
-					:title="t('tables', 'Shared views')" />
-
+					:table="table"
+					:is-shared-item="true" />
 				<NavigationViewItem
 					v-for="view in getSharedViews"
 					:key="'view'+view.id"
-					:view="view" />
+					:view="view"
+					:is-shared-item="true" />
 			</ul>
 
 			<div v-if="filterString !== ''" class="search-info">
@@ -60,7 +57,7 @@
 <script>
 import { NcAppNavigation, NcAppNavigationCaption, NcActionButton, NcTextField, NcButton, NcEmptyContent } from '@nextcloud/vue'
 import NavigationViewItem from '../partials/NavigationViewItem.vue'
-import NavigationDashboardItem from '../partials/NavigationTableItem.vue'
+import NavigationTableItem from '../partials/NavigationTableItem.vue'
 import { mapState } from 'vuex'
 import { emit } from '@nextcloud/event-bus'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
@@ -69,7 +66,7 @@ import { getCurrentUser } from '@nextcloud/auth'
 export default {
 	name: 'Navigation',
 	components: {
-		NavigationDashboardItem,
+		NavigationTableItem,
 		NavigationViewItem,
 		NcAppNavigation,
 		NcAppNavigationCaption,