diff --git a/app/Services/FileManagerService.php b/app/Services/FileManagerService.php
index 59f5dc45..cb3e657a 100644
--- a/app/Services/FileManagerService.php
+++ b/app/Services/FileManagerService.php
@@ -333,17 +333,13 @@ class FileManagerService
             if ($item['type'] === 'folder') {
 
                 Folder::find($item['id'])
-                    ->update([
-                        'parent_id' => $to_id
-                    ]);
+                    ->update(['parent_id' => $to_id]);
             }
 
             // Move file
             if ($item['type'] !== 'folder') {
                 UserFile::find($item['id'])
-                    ->update([
-                        'folder_id' => $to_id
-                    ]);
+                    ->update(['folder_id' => $to_id]);
             }
         }
     }
diff --git a/resources/js/components/Others/MoveItemPopup.vue b/resources/js/components/Others/MoveItemPopup.vue
index 1bf66fb1..c61889b8 100644
--- a/resources/js/components/Others/MoveItemPopup.vue
+++ b/resources/js/components/Others/MoveItemPopup.vue
@@ -50,6 +50,7 @@
     import ButtonBase from '@/components/FilesView/ButtonBase'
     import Spinner from '@/components/FilesView/Spinner'
     import TreeMenu from '@/components/Others/TreeMenu'
+    import {isArray, isNull} from 'lodash'
     import {mapGetters} from 'vuex'
     import {events} from '@/bus'
 
@@ -57,8 +58,8 @@
         name: 'MoveItemPopup',
         components: {
             ThumbnailItem,
-            PopupWrapper,
             MultiSelected,
+            PopupWrapper,
             PopupActions,
             PopupContent,
             PopupHeader,
@@ -67,7 +68,10 @@
             Spinner,
         },
         computed: {
-            ...mapGetters(['navigation', 'fileInfoDetail']),
+            ...mapGetters([
+                'fileInfoDetail',
+                'navigation',
+            ]),
         },
         data() {
             return {
@@ -83,7 +87,7 @@
                 if (!this.selectedFolder) return
 
                 // Prevent to move items to the same parent
-                if (this.fileInfoDetail.find(item => item.parent_id === this.selectedFolder.id)) return
+                if ( isArray(this.selectedFolder) && this.fileInfoDetail.find(item => item.parent_id === this.selectedFolder.id)) return
 
                 // Move item
                 if (!this.isSelectedItem) {
@@ -103,12 +107,14 @@
             },
         },
         mounted() {
-
-            // Select folder in tree
             events.$on('pick-folder', folder => {
 
                 if (folder.id === this.pickedItem.id) {
                     this.selectedFolder = undefined
+
+                } else if ( ! folder.id && folder.location === 'base') {
+                    this.selectedFolder = 'base'
+
                 } else {
                     this.selectedFolder = folder
                 }
@@ -162,35 +168,5 @@
 .multiple-selected {
     padding: 0 20px;;
     margin-bottom: 20px;
-
-    /deep/ .text {
-        .title {
-            color: $text;
-        }
-
-        .count {
-            color: $text-muted;
-        }
-    }
-
-    /deep/ .icon-wrapper {
-        .icon {
-            stroke: $theme;
-        }
-    }
-}
-
-@media (prefers-color-scheme: dark) {
-    .multiple-selected {
-        /deep/ .text {
-            .title {
-                color: $dark_mode_text_primary;
-            }
-
-            .count {
-                color: $dark_mode_text_secondary;
-            }
-        }
-    }
 }
 </style>
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index fdcac0e9..3e531c7e 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -3,7 +3,6 @@ import store from './store/index'
 import {debounce, includes, isArray} from "lodash";
 import {events} from './bus'
 import axios from 'axios'
-import router from '@/router'
 
 const Helpers = {
     install(Vue) {