diff --git a/app/Http/Controllers/Sharing/FileSharingController.php b/app/Http/Controllers/Sharing/FileSharingController.php
index 51074df8..1c6140f1 100644
--- a/app/Http/Controllers/Sharing/FileSharingController.php
+++ b/app/Http/Controllers/Sharing/FileSharingController.php
@@ -405,10 +405,12 @@ class FileSharingController extends Controller
     {
         $folders = FileManagerFolder::where('user_id', $shared->user_id)
             ->where('parent_id', $unique_id)
+            ->sortable()
             ->get();
 
         $files = FileManagerFile::where('user_id', $shared->user_id)
             ->where('folder_id', $unique_id)
+            ->sortable()
             ->get();
 
         return [$folders, $files];
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ebf8cc5c..27ce4e1b 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -30,7 +30,7 @@
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=826fbaa6cc4acab69f5d",
     "/chunks/files.js": "/chunks/files.js?id=76b46f43df974e899836",
     "/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=0f05ddf2dc00ffe8b639",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=048f772d72b5ae485d6e",
     "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=ed167949ea9398f0fbeb",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=aba8c662fbc234892216",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=7dfffa0f25308ba70b7a",
@@ -76,27 +76,13 @@
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=a99910f95c3e39caa78b",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=e8ea1e67f9ac0a835ed0",
     "/chunks/users.js": "/chunks/users.js?id=420d8c46141ab3e73395",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.4fdf74a24598b4192857.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4fdf74a24598b4192857.hot-update.js",
-    "/js/main.cee35e2720c067435718.hot-update.js": "/js/main.cee35e2720c067435718.hot-update.js",
-    "/js/main.6d4e06b3908203e48cd0.hot-update.js": "/js/main.6d4e06b3908203e48cd0.hot-update.js",
-    "/js/main.1d6513623f3e8cafe624.hot-update.js": "/js/main.1d6513623f3e8cafe624.hot-update.js",
-    "/js/main.7df2e5348ea812d79d3b.hot-update.js": "/js/main.7df2e5348ea812d79d3b.hot-update.js",
-    "/js/main.c1f3cf8c39d0e54e72ff.hot-update.js": "/js/main.c1f3cf8c39d0e54e72ff.hot-update.js",
-    "/js/main.0f3b3f45a2f54686ee98.hot-update.js": "/js/main.0f3b3f45a2f54686ee98.hot-update.js",
-    "/js/main.81278088dad5c0826f3f.hot-update.js": "/js/main.81278088dad5c0826f3f.hot-update.js",
-    "/js/main.c7f2cdb20f4d1364dbcf.hot-update.js": "/js/main.c7f2cdb20f4d1364dbcf.hot-update.js",
-    "/js/main.382b19d6b17b2d8b0cfc.hot-update.js": "/js/main.382b19d6b17b2d8b0cfc.hot-update.js",
-    "/chunks/shared-page.3c6318c4adb24dd7e8a6.hot-update.js": "/chunks/shared-page.3c6318c4adb24dd7e8a6.hot-update.js",
-    "/chunks/shared-page.607257526d26ae486cd7.hot-update.js": "/chunks/shared-page.607257526d26ae486cd7.hot-update.js",
-    "/chunks/shared-page.5ae59f268a3bafd56e42.hot-update.js": "/chunks/shared-page.5ae59f268a3bafd56e42.hot-update.js",
-    "/chunks/shared-page.04baec12f7ce0ea5255f.hot-update.js": "/chunks/shared-page.04baec12f7ce0ea5255f.hot-update.js",
-    "/chunks/shared-page.64b0c9b868f9a4b2f7b3.hot-update.js": "/chunks/shared-page.64b0c9b868f9a4b2f7b3.hot-update.js",
-    "/chunks/shared-page.28f36ba77b41772744bd.hot-update.js": "/chunks/shared-page.28f36ba77b41772744bd.hot-update.js",
-    "/chunks/shared-page.d84aa66f552be5215b0a.hot-update.js": "/chunks/shared-page.d84aa66f552be5215b0a.hot-update.js",
-    "/chunks/shared-page.d1fad7281f83a0eb3388.hot-update.js": "/chunks/shared-page.d1fad7281f83a0eb3388.hot-update.js",
-    "/chunks/shared-page.0d7bc824b445c544aa58.hot-update.js": "/chunks/shared-page.0d7bc824b445c544aa58.hot-update.js",
-    "/chunks/shared-page.eca5ebcc0c799761b650.hot-update.js": "/chunks/shared-page.eca5ebcc0c799761b650.hot-update.js",
-    "/chunks/shared-page.34b2eb78a8fa565492d4.hot-update.js": "/chunks/shared-page.34b2eb78a8fa565492d4.hot-update.js",
-    "/chunks/shared-page.8e8d72b84691f037187a.hot-update.js": "/chunks/shared-page.8e8d72b84691f037187a.hot-update.js",
-    "/js/main.4e6104b605cb464dea74.hot-update.js": "/js/main.4e6104b605cb464dea74.hot-update.js"
+    "/js/main.8d4cb880da1006d5c8e7.hot-update.js": "/js/main.8d4cb880da1006d5c8e7.hot-update.js",
+    "/js/main.7ca933a4fc956c3f8cee.hot-update.js": "/js/main.7ca933a4fc956c3f8cee.hot-update.js",
+    "/js/main.059482145d9321381825.hot-update.js": "/js/main.059482145d9321381825.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.8d718f0b675aebf2bf58.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8d718f0b675aebf2bf58.hot-update.js",
+    "/js/main.c45659e034eac03e460f.hot-update.js": "/js/main.c45659e034eac03e460f.hot-update.js",
+    "/js/main.4e5fedc844f022a122fb.hot-update.js": "/js/main.4e5fedc844f022a122fb.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.ab5b5ca838d04673ea6c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ab5b5ca838d04673ea6c.hot-update.js",
+    "/js/main.d4fb74bb05baeaade187.hot-update.js": "/js/main.d4fb74bb05baeaade187.hot-update.js",
+    "/js/main.bb92d9b1b6f04a416c19.hot-update.js": "/js/main.bb92d9b1b6f04a416c19.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/FileInfoPanel.vue b/resources/js/components/FilesView/FileInfoPanel.vue
index 6bd480fc..4de0ba74 100644
--- a/resources/js/components/FilesView/FileInfoPanel.vue
+++ b/resources/js/components/FilesView/FileInfoPanel.vue
@@ -129,7 +129,7 @@
             },
             moveItem() {
                 // Move item fire popup
-                events.$emit('popup:open', {name: 'move', item: this.fileInfoDetail[0]})
+               events.$emit("popup:open", { name: "move", item: this.fileInfoDetail});
             }
         }
     }
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index a5db4c44..19dbb26f 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -308,27 +308,20 @@ const Helpers = {
               return validated
         }
         Vue.prototype.$getDataByLocation = function() {
+
             let folder = store.getters.currentFolder
+
+            let actions = {
+                'base' : ['getFolder', [{ folder: folder, back: true, init: false, sorting:true}]],
+                'public' : ['browseShared', [{ folder: folder, back: true, init: false, sorting:true}]],
+                'latest' : ['getLatest'],
+                'shared' : ['getShared'],
+                'trash-root' : ['getTrash'],
+                'participant_uploads' : ['getParticipantUploads'],
+            }
+
+            this.$store.dispatch(...actions[folder.location])
             
-            if(this.$isThisLocation('base') || this.$isThisLocation('public')){
-                this.$store.dispatch('getFolder', [{ folder: folder, back: true, init: false, sorting:true}])
-            }
-
-            if(this.$isThisLocation('latest')) {
-                this.$store.dispatch('getLatest')
-            }
-
-            if(this.$isThisLocation('shared')) {
-                this.$store.dispatch('getShared')
-            }
-
-            if(this.$isThisLocation('participant_uploads')) {
-                this.$store.dispatch('getParticipantUploads')
-            }
-
-            if(this.$isThisLocation('trash-root')) {
-                this.$store.dispatch('getTrash')
-            }
             // Get dara of user with favourites tree
             this.$store.dispatch('getAppData')
 
diff --git a/resources/js/store/modules/sharing.js b/resources/js/store/modules/sharing.js
index e03ae51c..f7d39e2e 100644
--- a/resources/js/store/modules/sharing.js
+++ b/resources/js/store/modules/sharing.js
@@ -32,7 +32,7 @@ const actions = {
             events.$emit('clear-query')
         }
 
-        if (! payload.back)
+        if (! payload.back && !payload.sorting)
             commit('STORE_PREVIOUS_FOLDER', getters.currentFolder)
 
         payload.folder.location = 'public'
@@ -43,13 +43,13 @@ const actions = {
 
         return new Promise((resolve, reject) => {
             axios
-                .get(route)
+                .get(route + getters.sorting.URI)
                 .then(response => {
                     commit('LOADING_STATE', {loading: false, data: response.data})
                     commit('STORE_CURRENT_FOLDER', payload.folder)
                     events.$emit('scrollTop')
 
-                    if (payload.back)
+                    if (payload.back && !payload.sorting)
                         commit('REMOVE_BROWSER_HISTORY')
 
                     resolve(response)