diff --git a/src/actions/sharingPopupAction.js b/src/actions/sharingPopupAction.js
index 1ff0f8f..0aba49b 100644
--- a/src/actions/sharingPopupAction.js
+++ b/src/actions/sharingPopupAction.js
@@ -67,7 +67,13 @@ export const action = new FileAction({
 	async exec(node, view, dir) {
 		// You need read permissions to see the sidebar
 		if ((node.permissions & Permission.READ) !== 0) {
+			setTimeout(() => {
+				const currentUrl = window.location.search
 
+				if (currentUrl.includes('popup')) {
+					document.querySelector('#app-sidebar-vue').style.width = '0%'
+				}
+			})
 			window.OCA.Files.Sidebar.close()
 
 			window.OCA.Files.Sidebar.setActiveTab('sharing-manage')
diff --git a/src/components/OpenSharingButton.vue b/src/components/OpenSharingButton.vue
index 2cbeb70..2329f3a 100644
--- a/src/components/OpenSharingButton.vue
+++ b/src/components/OpenSharingButton.vue
@@ -37,6 +37,11 @@ export default {
 				window.OCA.Files.Sidebar.setActiveTab('sharing')
 				window.OCA.Files.Sidebar.setFullScreenMode(true)
 
+				const currentUrl = window.location.search
+				if (!currentUrl.includes('openfile')) {
+					document.querySelector('#app-sidebar-vue').style.width = '0%'
+				}
+
 				// TODO: migrate Sidebar to use a Node instead
 				window.OCA.Files.Sidebar.open(fileInfoPathName)
 
diff --git a/src/views/SharingPopup.vue b/src/views/SharingPopup.vue
index da1b287..7b39af6 100644
--- a/src/views/SharingPopup.vue
+++ b/src/views/SharingPopup.vue
@@ -209,12 +209,13 @@ export default {
 
 		closeThisModal() {
 			this.modal = false
+			const currentUrl = window.location.search
 
 			if (this.newLinkShare || this.shareSent) {
 				this.openSharingManage()
 			} else {
 				window.OCA.Files.Sidebar.close()
-				window.OCA.Files.Sidebar.setFullScreenMode(false)
+				currentUrl.includes('openfile') ? window.OCA.Files.Sidebar.setFullScreenMode(true) : window.OCA.Files.Sidebar.setFullScreenMode(false)
 			}
 		},
 
@@ -225,7 +226,12 @@ export default {
 				window.OCA.Files.Sidebar.close()
 				window.OCA.Files.Sidebar.setActiveTab('sharing')
 				window.OCA.Files.Sidebar.setActiveTab('sharing-manage')
-				window.OCA.Files.Sidebar.setFullScreenMode(false)
+				document.querySelector('#app-sidebar-vue').style.width = 'var(--app-sidebar-width)'
+
+				// set setfullscreen sidebar if opened in viewer else not
+				const currentSearch = window.location.search
+				const isTargetSearch = (currentSearch === '?dir=/' || currentSearch === '?dir=/&popup=true')
+				isTargetSearch ? window.OCA.Files.Sidebar.setFullScreenMode(false) : window.OCA.Files.Sidebar.setFullScreenMode(true)
 
 				// TODO: migrate Sidebar to use a Node instead
 				window.OCA.Files.Sidebar.open(fileInfoPathName)