diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index cf4d92ec..97b6c890 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -27,9 +27,9 @@
     "/chunks/database.js": "/chunks/database.js?id=416a5164bdc53c97ea34",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=464c8e70974d492ce7f6",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=405847df44edd86e301a",
-    "/chunks/files.js": "/chunks/files.js?id=f1d8017665f8cb3090cf",
+    "/chunks/files.js": "/chunks/files.js?id=a5fb4b0c2579d154a4c0",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=8ccd35de575e8a91d02f",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=bffd7a32d37275ac9c2c",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=e5a07c9ff0331391e38d",
     "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=b013006caf6a7063b0b8",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=aba8c662fbc234892216",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=ecceaa6cdf5768826b36",
@@ -56,7 +56,7 @@
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=367c9478591c7a4a2889",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=7da589bd335deefd5f65",
     "/chunks/shared-files.js": "/chunks/shared-files.js?id=50538c88a0471fe4db6f",
-    "/chunks/shared-page.js": "/chunks/shared-page.js?id=4c1b302d65112aad96ea",
+    "/chunks/shared-page.js": "/chunks/shared-page.js?id=5a60a38ddf88f79ef9cd",
     "/chunks/sign-in.js": "/chunks/sign-in.js?id=703fbd23d18816590337",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=cedca52c29abfb3c58f1",
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=9dec4c59d5a32fb9b855",
@@ -189,5 +189,11 @@
     "/js/main.d01b68b495ef9b84a946.hot-update.js": "/js/main.d01b68b495ef9b84a946.hot-update.js",
     "/js/main.a785a6e8c170b66e8b3f.hot-update.js": "/js/main.a785a6e8c170b66e8b3f.hot-update.js",
     "/js/main.3c8558fe63ee18aa5ce8.hot-update.js": "/js/main.3c8558fe63ee18aa5ce8.hot-update.js",
-    "/js/main.d7c86488131a23b0bcfa.hot-update.js": "/js/main.d7c86488131a23b0bcfa.hot-update.js"
+    "/js/main.d7c86488131a23b0bcfa.hot-update.js": "/js/main.d7c86488131a23b0bcfa.hot-update.js",
+    "/chunks/files.ff0d0bc49e3ae16d6353.hot-update.js": "/chunks/files.ff0d0bc49e3ae16d6353.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.be8bb5a516b1bebbd333.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.be8bb5a516b1bebbd333.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.fa328eafcf496ae0faf0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fa328eafcf496ae0faf0.hot-update.js",
+    "/js/main.a21d17e299950f5674e4.hot-update.js": "/js/main.a21d17e299950f5674e4.hot-update.js",
+    "/chunks/shared-page.a3931242af32ec3b248c.hot-update.js": "/chunks/shared-page.a3931242af32ec3b248c.hot-update.js",
+    "/chunks/shared-page.c3f93d4814397c5cd837.hot-update.js": "/chunks/shared-page.c3f93d4814397c5cd837.hot-update.js"
 }
diff --git a/resources/js/App.vue b/resources/js/App.vue
index c6e418fd..07c03e7d 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -28,6 +28,7 @@
             <!-- Mobile Menu for Multiselected items -->
             <MobileMultiSelectMenu/>
 
+            <!-- Multi Select Drag & Drop UI -->
             <MultiSelected :draged-ghost="draged" :draged-item="dragedItem" v-show="draged" id="multi-select-ui"/>
 
             <!--Mobile Menu-->
diff --git a/resources/js/components/FilesView/ContextMenu.vue b/resources/js/components/FilesView/ContextMenu.vue
index 776a6a84..b71243d6 100644
--- a/resources/js/components/FilesView/ContextMenu.vue
+++ b/resources/js/components/FilesView/ContextMenu.vue
@@ -111,7 +111,7 @@
                 </li>
             </ul>
             <ul class="menu-option-group" v-if="item">
-                <li class="menu-option" @click="renameItem">
+                <li class="menu-option" @click="renameItem" v-if="multiSelectContextMenu">
                     <div class="icon">
                         <edit2-icon size="17"></edit2-icon>
                     </div>
@@ -188,7 +188,7 @@
                 </li>
             </ul>
             <ul class="menu-option-group" v-if="item">
-                <li class="menu-option" @click="renameItem">
+                <li class="menu-option" @click="renameItem" v-if="multiSelectContextMenu">
                     <div class="icon">
                         <edit2-icon size="17"></edit2-icon>
                     </div>
@@ -258,7 +258,7 @@
                 </li>
             </ul>
             <ul class="menu-option-group" v-if="item">
-                <li class="menu-option" @click="renameItem">
+                <li class="menu-option" @click="renameItem" v-if="multiSelectContextMenu">
                     <div class="icon">
                         <edit2-icon size="17"></edit2-icon>
                     </div>
diff --git a/resources/js/views/FilePages/Files.vue b/resources/js/views/FilePages/Files.vue
index 68b0d9ce..a51666c4 100644
--- a/resources/js/views/FilePages/Files.vue
+++ b/resources/js/views/FilePages/Files.vue
@@ -181,6 +181,7 @@
                 this.$store.dispatch('addToFavourites', null)            
                 }
 
+                 events.$emit('drop')
             },
             removeFavourite(folder) {
                 this.$store.dispatch('removeFromFavourites', folder)
diff --git a/resources/js/views/Shared/SharedPage.vue b/resources/js/views/Shared/SharedPage.vue
index 28e01827..ab00495b 100644
--- a/resources/js/views/Shared/SharedPage.vue
+++ b/resources/js/views/Shared/SharedPage.vue
@@ -16,6 +16,9 @@
         <!--Rename folder or file item-->
         <RenameItem/>
 
+         <!-- Multi Select Drag & Drop UI -->
+        <MultiSelected :draged-ghost="draged" :draged-item="dragedItem" v-show="draged" id="multi-select-ui"/>
+
         <!--Mobile Menu-->
         <MobileMenu/>
 
@@ -111,6 +114,7 @@
     import FileFullPreview from '@/components/FilesView/FileFullPreview'
     import DesktopToolbar from '@/components/FilesView/DesktopToolbar'
     import ContentSidebar from '@/components/Sidebar/ContentSidebar'
+    import MultiSelected from '@/components/FilesView/MultiSelected'
     import FileItemGrid from '@/components/FilesView/FileItemGrid'
     import ContentGroup from '@/components/Sidebar/ContentGroup'
     import FileBrowser from '@/components/FilesView/FileBrowser'
@@ -142,6 +146,7 @@
             FileFullPreview,
             DesktopToolbar,
             ContentSidebar,
+            MultiSelected,
             FileItemGrid,
             ContentGroup,
             AuthContent,
@@ -183,6 +188,8 @@
                 isPageLoading: true,
                 currentPage: undefined,
                 homeDirectory: undefined,
+                draged: false,
+                dragedItem: undefined
             }
         },
         methods: {
@@ -262,6 +269,23 @@
         },
         created() {
 
+             // Handle default scrollbar for the macOS
+             if (!navigator.userAgent.indexOf('Mac OS X') != -1) {
+               let body = document.body
+               body.classList.add('scroll-bar')
+            }
+
+             // Hnadle Drag & Drop Ghost show
+            events.$on('dragstart', (data) => {
+                this.dragedItem = data
+                setTimeout(() => {
+                    this.draged = true
+                }, 50);
+             })
+            events.$on('drop', () => {
+                this.draged = false
+            })
+
             axios
                 .get('/api/shared/' + this.$route.params.token, )
                 .then(response => {