diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php
index d4780fd24..82ec9e7fe 100644
--- a/lib/Service/ShareService.php
+++ b/lib/Service/ShareService.php
@@ -339,6 +339,7 @@ public function updateDisplayMode(int $shareId, int $displayMode, string $userId
 				}
 			} else {
 				// setting user display mode override only requires access
+				// this does not seem to work
 				if (!$this->permissionsService->canAccessContextById($item->getId())) {
 					throw new PermissionError(sprintf('PermissionError: can not update share with id %d', $shareId));
 				}
diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index 17cf8a85a..a02674418 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -44,19 +44,19 @@
 			</div>
 			<div class="row space-T">
 				<div>
-					{{ t('tables', 'Navigation bar entry') }}
+					{{ t('tables', 'Navigation bar display') }}
 				</div>
 				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_HIDDEN"
 					name="NAV_ENTRY_MODE_HIDDEN" type="radio">
-					No navigation bar entry
+					Hide navigation entry for everybody
 				</NcCheckboxRadioSwitch>
 				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_RECIPIENTS"
 					name="NAV_ENTRY_MODE_RECIPIENTS" type="radio">
-					Navigation bar entry for share recipients, but not the owner
+					Show navigation entry for everybody, except me
 				</NcCheckboxRadioSwitch>
 				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_ALL" name="NAV_ENTRY_MODE_ALL"
 					type="radio">
-					Navigation bar entry for everybody
+					Show navigation entry for everybody
 				</NcCheckboxRadioSwitch>
 				<br>
 			</div>
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 5690ca21f..356a9cfd8 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -38,7 +38,24 @@
 				</div>
 				<NcContextResource :resources.sync="resources" :receivers.sync="receivers" />
 			</div>
-
+			<div class="row space-T">
+				<div>
+					{{ t('tables', 'Navigation bar display') }}
+				</div>
+				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_HIDDEN"
+					name="NAV_ENTRY_MODE_HIDDEN" type="radio">
+					Hide navigation entry for everybody
+				</NcCheckboxRadioSwitch>
+				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_RECIPIENTS"
+					name="NAV_ENTRY_MODE_RECIPIENTS" type="radio">
+					Show navigation entry for everybody, except me
+				</NcCheckboxRadioSwitch>
+				<NcCheckboxRadioSwitch :checked.sync="displayMode" value="NAV_ENTRY_MODE_ALL" name="NAV_ENTRY_MODE_ALL"
+					type="radio">
+					Show navigation entry for everybody
+				</NcCheckboxRadioSwitch>
+				<br>
+			</div>
 			<div class="row space-T">
 				<div class="fix-col-4 space-T justify-between">
 					<NcButton v-if="!prepareDeleteContext" type="error" @click="prepareDeleteContext = true">
@@ -62,7 +79,7 @@
 </template>
 
 <script>
-import { NcDialog, NcButton, NcIconSvgWrapper } from '@nextcloud/vue'
+import { NcModal, NcButton, NcIconSvgWrapper, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { getCurrentUser } from '@nextcloud/auth'
 import '@nextcloud/dialogs/style.css'
@@ -74,6 +91,7 @@ import svgHelper from '../../shared/components/ncIconPicker/mixins/svgHelper.js'
 import permissionBitmask from '../../shared/components/ncContextResource/mixins/permissionBitmask.js'
 import { emit } from '@nextcloud/event-bus'
 import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
+import { NAV_ENTRY_MODE } from '../../shared/constants.js'
 
 export default {
 	name: 'EditContext',
@@ -83,6 +101,7 @@ export default {
 		NcIconPicker,
 		NcIconSvgWrapper,
 		NcContextResource,
+		NcCheckboxRadioSwitch,
 	},
 	mixins: [svgHelper, permissionBitmask, permissionsMixin],
 	props: {
@@ -111,6 +130,7 @@ export default {
 			PERMISSION_UPDATE,
 			PERMISSION_DELETE,
 			prepareDeleteContext: false,
+			displayMode: 'NAV_ENTRY_MODE_HIDDEN', // TODO: get the actual saved display mode
 		}
 	},
 	computed: {
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index 1651fd3e8..681215421 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -15,7 +15,8 @@
 			</template>
 		</template>
 		<template #actions>
-			<NcActionButton v-if="ownsContext(context)" :close-after-click="true" data-cy="navigationContextEditBtn" @click="editContext">
+			<NcActionButton v-if="ownsContext(context)" :close-after-click="true" data-cy="navigationContextEditBtn"
+				@click="editContext">
 				<template #icon>
 					<PlaylistEdit :size="20" />
 				</template>
@@ -27,13 +28,14 @@
 				</template>
 				{{ t('tables', 'Transfer application') }}
 			</NcActionButton>
-			<NcActionButton v-if="ownsContext(context)" :close-after-click="true" data-cy="navigationContextDeleteBtn" @click="deleteContext">
+			<NcActionButton v-if="ownsContext(context)" :close-after-click="true" data-cy="navigationContextDeleteBtn"
+				@click="deleteContext">
 				<template #icon>
 					<Delete :size="20" />
 				</template>
 				{{ t('tables', 'Delete application') }}
 			</NcActionButton>
-			<NcActionCheckbox :value="showInNavigation" @change="updateDisplayMode">
+			<NcActionCheckbox v-if="!ownsContext(context)" :value="showInNavigation" @change="updateDisplayMode">
 				Show in Navigation
 			</NcActionCheckbox>
 		</template>
@@ -51,6 +53,7 @@ import Delete from 'vue-material-design-icons/Delete.vue'
 import permissionsMixin from '../../../shared/components/ncTable/mixins/permissionsMixin.js'
 import svgHelper from '../../../shared/components/ncIconPicker/mixins/svgHelper.js'
 import { getCurrentUser } from '@nextcloud/auth'
+import { NAV_ENTRY_MODE } from '../../../shared/constants.js'
 
 export default {
 	name: 'NavigationContextItem',
@@ -78,7 +81,7 @@ export default {
 	data() {
 		return {
 			icon: null,
-			showInNavigation: false,
+			showInNavigation: this.getDisplayMode(),
 		}
 	},
 	computed: {
@@ -105,13 +108,18 @@ export default {
 		deleteContext() {
 			emit('tables:context:delete', this.context)
 		},
+		getDisplayMode() {
+			const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
+			if (share) {
+				return share.display_mode
+			}
+			return 0
+		},
 		updateDisplayMode() {
-			this.showInNavigation = !this.showInNavigation
-			if (this.context) {
-				const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
-				if (share) {
-					this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode: this.showInNavigation ? 1 : 0, userId: getCurrentUser().uid })
-				}
+			this.showInNavigation = this.showInNavigation ? 0 : 1
+			const share = Object.values(this.context.sharing || {}).find(share => share.receiver === getCurrentUser().uid)
+			if (share) {
+				this.$store.dispatch('updateDisplayMode', { shareId: share.share_id, displayMode: this.showInNavigation ? NAV_ENTRY_MODE['NAV_ENTRY_MODE_RECIPIENTS'] : NAV_ENTRY_MODE['NAV_ENTRY_MODE_HIDDEN'], target: 'self' })
 			}
 		},
 	},
diff --git a/src/shared/constants.js b/src/shared/constants.js
index 0a2d23910..c3bb66cc2 100644
--- a/src/shared/constants.js
+++ b/src/shared/constants.js
@@ -27,7 +27,7 @@ export const TYPE_DATETIME = 'datetime'
 export const TYPE_USERGROUP = 'usergroup'
 
 export const NAV_ENTRY_MODE = {
-	NAV_ENTRY_MODE_HIDDEN: 0,
-	NAV_ENTRY_MODE_RECIPIENTS: 1,
-	NAV_ENTRY_MODE_ALL: 2,
+	NAV_ENTRY_MODE_HIDDEN: 0, // no nav bar entry
+	NAV_ENTRY_MODE_RECIPIENTS: 1, // nav bar entry for share recipients, but not the owner
+	NAV_ENTRY_MODE_ALL: 2, // nav bar entry for everybody
 }
diff --git a/src/store/store.js b/src/store/store.js
index ff5cdbd2c..3fbbab65f 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -381,9 +381,9 @@ export default new Vuex.Store({
 			}
 		},
 
-		async updateDisplayMode({ dispatch }, { shareId, displayMode, userId }) {
+		async updateDisplayMode({ dispatch }, { shareId, displayMode, target }) {
 			try {
-				await axios.put(generateUrl('/apps/tables/share/' + shareId + '/display-mode'), { displayMode, userId })
+				await axios.put(generateUrl('/apps/tables/share/' + shareId + '/display-mode'), { displayMode, target })
 			} catch (e) {
 				displayError(e, t('tables', 'Could not update display mode.'))
 			}