diff --git a/lib/Service/ViewService.php b/lib/Service/ViewService.php
index 2c09a880a..c2f9e9ea0 100644
--- a/lib/Service/ViewService.php
+++ b/lib/Service/ViewService.php
@@ -289,37 +289,48 @@ private function enhanceView(View $view, string $userId): void {
 		// set if this is a shared table with you (somebody else shared it with you)
 		// (senseless if we have no user in context)
 		if ($userId !== '') {
-			try {
-				$permissions = $this->shareService->getSharedPermissionsIfSharedWithMe($view->getId(), 'view', $userId);
-				$view->setIsShared(true);
-				$canManageTable = false;
+			if ($userId !== $view->getOwnership()) {
 				try {
-					$manageTableShare = $this->shareService->getSharedPermissionsIfSharedWithMe($view->getTableId(), 'table', $userId);
-					$canManageTable = $manageTableShare['manage'] ?? false;
+					$permissions = $this->shareService->getSharedPermissionsIfSharedWithMe($view->getId(), 'view', $userId);
+					$view->setIsShared(true);
+					$canManageTable = false;
+					try {
+						$manageTableShare = $this->shareService->getSharedPermissionsIfSharedWithMe($view->getTableId(), 'table', $userId);
+						$canManageTable = $manageTableShare['manage'] ?? false;
+					} catch (NotFoundError $e) {
+					} catch (\Exception $e) {
+						throw new InternalError($e);
+					}
+					$view->setOnSharePermissions([
+						'read' => $permissions['read'] ?? false,
+						'create' => $permissions['create'] ?? false,
+						'update' => $permissions['update'] ?? false,
+						'delete' => $permissions['delete'] ?? false,
+						'manage' => $permissions['manage'] ?? false,
+						'manageTable' => $canManageTable
+					]);
 				} catch (NotFoundError $e) {
 				} catch (\Exception $e) {
-					throw new InternalError($e);
+					$this->logger->warning('Exception occurred while setting shared permissions: '.$e->getMessage().' No permissions granted.');
+					$view->setOnSharePermissions([
+						'read' => false,
+						'create' => false,
+						'update' => false,
+						'delete' => false,
+						'manage' => false,
+						'manageTable' => false
+					]);
+				}
+			} else {
+				// set hasShares if this table is shared by you (you share it with somebody else)
+				// (senseless if we have no user in context)
+				try {
+					$allShares = $this->shareService->findAll('view', $view->getId());
+					$view->setHasShares(count($allShares) !== 0);
+				} catch (InternalError $e) {
 				}
-				$view->setOnSharePermissions([
-					'read' => $permissions['read'] ?? false,
-					'create' => $permissions['create'] ?? false,
-					'update' => $permissions['update'] ?? false,
-					'delete' => $permissions['delete'] ?? false,
-					'manage' => $permissions['manage'] ?? false,
-					'manageTable' => $canManageTable
-				]);
-			} catch (NotFoundError $e) {
-			} catch (\Exception $e) {
-				$this->logger->warning('Exception occurred while setting shared permissions: '.$e->getMessage().' No permissions granted.');
-				$view->setOnSharePermissions([
-					'read' => false,
-					'create' => false,
-					'update' => false,
-					'delete' => false,
-					'manage' => false,
-					'manageTable' => false
-				]);
 			}
+
 		}
 
 		if (!$this->permissionsService->canReadRowsByElement($view, 'view', $userId)) {
@@ -331,19 +342,6 @@ private function enhanceView(View $view, string $userId): void {
 		} catch (InternalError|PermissionError $e) {
 		}
 
-		if (!$this->permissionsService->canManageTableById($view->getTableId(), $userId)) {
-			return;
-		}
-
-		// set hasShares if this table is shared by you (you share it with somebody else)
-		// (senseless if we have no user in context)
-		if ($userId !== '') {
-			try {
-				$allShares = $this->shareService->findAll('view', $view->getId());
-				$view->setHasShares(count($allShares) !== 0);
-			} catch (InternalError $e) {
-			}
-		}
 		if($view->getIsShared()) {
 			// Remove detailed view filtering and sorting information if necessary
 			if(!$view->getOnSharePermissions()['manageTable']) {
diff --git a/src/App.vue b/src/App.vue
index dab111b50..fdec66c81 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,7 +13,7 @@
 <script>
 import { NcContent, NcAppContent } from '@nextcloud/vue'
 import Navigation from './modules/navigation/sections/Navigation.vue'
-import { mapState, mapGetters } from 'vuex'
+import { mapState } from 'vuex'
 import Sidebar from './modules/sidebar/sections/Sidebar.vue'
 
 export default {
@@ -53,13 +53,15 @@ export default {
 	},
 	methods: {
 		routing(currentRoute) {
-			if (currentRoute.name === 'table') {
+			if (currentRoute.name === 'row') {
+				this.$store.commit('setActiveRowId', parseInt(currentRoute.params.rowId))
+			} else {
+				this.$store.commit('setActiveRowId', null)
+			}
+			if (currentRoute.path.startsWith('/table/')) {
 				this.$store.commit('setActiveTableId', parseInt(currentRoute.params.tableId))
-			} else if (currentRoute.name === 'view') {
+			} else if (currentRoute.path.startsWith('/view/')) {
 				this.$store.commit('setActiveViewId', parseInt(currentRoute.params.viewId))
-			} else if (currentRoute.name === 'row') {
-				this.$store.commit('setActiveViewId', parseInt(currentRoute.params.viewId))
-				this.$store.commit('setActiveRowId', parseInt(currentRoute.params.rowId))
 			}
 		},
 	},
diff --git a/src/modules/main/sections/MainWrapper.vue b/src/modules/main/sections/MainWrapper.vue
index 281f130f2..c466e2c72 100644
--- a/src/modules/main/sections/MainWrapper.vue
+++ b/src/modules/main/sections/MainWrapper.vue
@@ -65,6 +65,7 @@ export default {
 	},
 
 	computed: {
+		...mapState(['activeRowId']),
 		...mapState({
 			columns: state => state.data.columns,
 			rows: state => state.data.rows,
@@ -82,7 +83,6 @@ export default {
 		this.reload(true)
 	},
 
-
 	methods: {
 		createColumn() {
 			emit('tables:column:create')
@@ -128,6 +128,9 @@ export default {
 					id: this.element.id,
 					isView: this.isView,
 				}
+				if (this.activeRowId) {
+					emit('tables:row:edit', { row: this.rows.find(r => r.id === this.activeRowId), columns: this.columns })
+				}
 				this.localLoading = false
 			}
 		},
diff --git a/src/modules/main/sections/View.vue b/src/modules/main/sections/View.vue
index ed77433f5..9d58bd34d 100644
--- a/src/modules/main/sections/View.vue
+++ b/src/modules/main/sections/View.vue
@@ -71,7 +71,6 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
 import TableView from '../partials/TableView.vue'
 
 import EmptyView from './EmptyView.vue'
@@ -127,7 +126,6 @@ export default {
 		}
 	},
 	computed: {
-		...mapState(['activeRowId']),
 		isViewSettingSet() {
 			return !(!this.viewSetting || ((!this.viewSetting.hiddenColumns || this.viewSetting.hiddenColumns.length === 0) && (!this.viewSetting.sorting) && (!this.viewSetting.filter || this.viewSetting.filter.length === 0)))
 		},
diff --git a/src/modules/modals/EditRow.vue b/src/modules/modals/EditRow.vue
index 2753ff96c..b6fd53751 100644
--- a/src/modules/modals/EditRow.vue
+++ b/src/modules/modals/EditRow.vue
@@ -85,7 +85,14 @@ export default {
 	},
 	watch: {
 		row() {
-			this.loadValues()
+			if (this.row) {
+				if (this.$router.currentRoute.path.includes('/row/')) {
+					this.$router.replace(this.$router.currentRoute.path.split('/row/')[0])
+				}
+				this.$router.push(this.$router.currentRoute.path + '/row/' + this.row.id)
+				this.$store.commit('setActiveRowId', null)
+				this.loadValues()
+			}
 		},
 	},
 	methods: {
@@ -99,6 +106,7 @@ export default {
 			}
 		},
 		actionCancel() {
+			this.$router.back()
 			this.reset()
 			this.$emit('close')
 		},
diff --git a/src/router.js b/src/router.js
index 856cd4558..b459644c1 100644
--- a/src/router.js
+++ b/src/router.js
@@ -20,6 +20,11 @@ export default new Router({
 			component: MainDashboardWrapper,
 			name: 'table',
 		},
+		{
+			path: '/table/:tableId/row/:rowId',
+			component: MainDashboardWrapper,
+			name: 'row',
+		},
 		{
 			path: '/view/:viewId',
 			component: MainViewWrapper,