diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 03d63115..daa92950 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -193,5 +193,66 @@
     "/js/main.02620d9ea73372cf1e92.hot-update.js": "/js/main.02620d9ea73372cf1e92.hot-update.js",
     "/js/main.cb392eeb311a3450efa6.hot-update.js": "/js/main.cb392eeb311a3450efa6.hot-update.js",
     "/js/main.7dc6c8021c7790a265ee.hot-update.js": "/js/main.7dc6c8021c7790a265ee.hot-update.js",
-    "/js/main.95461813df3da7c29418.hot-update.js": "/js/main.95461813df3da7c29418.hot-update.js"
+    "/js/main.95461813df3da7c29418.hot-update.js": "/js/main.95461813df3da7c29418.hot-update.js",
+    "/js/main.a7a2ea89e692140492ff.hot-update.js": "/js/main.a7a2ea89e692140492ff.hot-update.js",
+    "/js/main.a391ab2c5ee083a03575.hot-update.js": "/js/main.a391ab2c5ee083a03575.hot-update.js",
+    "/js/main.b8e29efd2a256a723eab.hot-update.js": "/js/main.b8e29efd2a256a723eab.hot-update.js",
+    "/js/main.f0b0eb51c54bcb1bbc78.hot-update.js": "/js/main.f0b0eb51c54bcb1bbc78.hot-update.js",
+    "/js/main.4a0d91d5bf37715b207e.hot-update.js": "/js/main.4a0d91d5bf37715b207e.hot-update.js",
+    "/js/main.27331fa21a51011f55a3.hot-update.js": "/js/main.27331fa21a51011f55a3.hot-update.js",
+    "/js/main.89d88cd3137f0fc7a962.hot-update.js": "/js/main.89d88cd3137f0fc7a962.hot-update.js",
+    "/js/main.783413c68c98a7454e3e.hot-update.js": "/js/main.783413c68c98a7454e3e.hot-update.js",
+    "/js/main.76182162f944a547d76c.hot-update.js": "/js/main.76182162f944a547d76c.hot-update.js",
+    "/js/main.d9d79e6ebbfe0c435f30.hot-update.js": "/js/main.d9d79e6ebbfe0c435f30.hot-update.js",
+    "/js/main.ac0e98364986af5abc1a.hot-update.js": "/js/main.ac0e98364986af5abc1a.hot-update.js",
+    "/js/main.a5102164804b6b88312b.hot-update.js": "/js/main.a5102164804b6b88312b.hot-update.js",
+    "/js/main.1728d1958465ea2611e4.hot-update.js": "/js/main.1728d1958465ea2611e4.hot-update.js",
+    "/js/main.9724db5ee29967cfa45a.hot-update.js": "/js/main.9724db5ee29967cfa45a.hot-update.js",
+    "/js/main.fd64fcfd705dd8a7e1ef.hot-update.js": "/js/main.fd64fcfd705dd8a7e1ef.hot-update.js",
+    "/js/main.e11a8c140aa8e041811e.hot-update.js": "/js/main.e11a8c140aa8e041811e.hot-update.js",
+    "/js/main.663ed5fdb6a7148b980d.hot-update.js": "/js/main.663ed5fdb6a7148b980d.hot-update.js",
+    "/js/main.0aca91ec2da9fb1e2d53.hot-update.js": "/js/main.0aca91ec2da9fb1e2d53.hot-update.js",
+    "/js/main.10ba1a4f46317ab617d2.hot-update.js": "/js/main.10ba1a4f46317ab617d2.hot-update.js",
+    "/js/main.4f643631871b873b5c75.hot-update.js": "/js/main.4f643631871b873b5c75.hot-update.js",
+    "/js/main.8b01f011bc2e522449b0.hot-update.js": "/js/main.8b01f011bc2e522449b0.hot-update.js",
+    "/js/main.7138a4cf6df2acdff3d2.hot-update.js": "/js/main.7138a4cf6df2acdff3d2.hot-update.js",
+    "/js/main.fa1364731479bf9ec130.hot-update.js": "/js/main.fa1364731479bf9ec130.hot-update.js",
+    "/js/main.84ce4223fb2bc69bfc09.hot-update.js": "/js/main.84ce4223fb2bc69bfc09.hot-update.js",
+    "/js/main.ec50a152b4df776758ee.hot-update.js": "/js/main.ec50a152b4df776758ee.hot-update.js",
+    "/js/main.f8a5b6420191743aa3e5.hot-update.js": "/js/main.f8a5b6420191743aa3e5.hot-update.js",
+    "/js/main.5a5835cdcb397d03b4e3.hot-update.js": "/js/main.5a5835cdcb397d03b4e3.hot-update.js",
+    "/js/main.baa181a26f9656444cbb.hot-update.js": "/js/main.baa181a26f9656444cbb.hot-update.js",
+    "/js/main.565f106e3cee6cfa9489.hot-update.js": "/js/main.565f106e3cee6cfa9489.hot-update.js",
+    "/js/main.3975c81cc6d0fa868245.hot-update.js": "/js/main.3975c81cc6d0fa868245.hot-update.js",
+    "/js/main.d238d4491157f14ad1d3.hot-update.js": "/js/main.d238d4491157f14ad1d3.hot-update.js",
+    "/js/main.bcb996a7bbfeb8bc6ff9.hot-update.js": "/js/main.bcb996a7bbfeb8bc6ff9.hot-update.js",
+    "/js/main.417b96e1be4710c56aff.hot-update.js": "/js/main.417b96e1be4710c56aff.hot-update.js",
+    "/js/main.dc5ab7a8982f74d9459d.hot-update.js": "/js/main.dc5ab7a8982f74d9459d.hot-update.js",
+    "/js/main.e6946e16dc5411cf4a6b.hot-update.js": "/js/main.e6946e16dc5411cf4a6b.hot-update.js",
+    "/js/main.c9e83c927343c03a2c35.hot-update.js": "/js/main.c9e83c927343c03a2c35.hot-update.js",
+    "/js/main.908bf08788c3bb8d2752.hot-update.js": "/js/main.908bf08788c3bb8d2752.hot-update.js",
+    "/js/main.eb3d12ad8a5a0028418f.hot-update.js": "/js/main.eb3d12ad8a5a0028418f.hot-update.js",
+    "/js/main.64afec2f2ecaa3aeead5.hot-update.js": "/js/main.64afec2f2ecaa3aeead5.hot-update.js",
+    "/js/main.5018f5af703ff0f018d2.hot-update.js": "/js/main.5018f5af703ff0f018d2.hot-update.js",
+    "/js/main.d300d5e108b8aca21244.hot-update.js": "/js/main.d300d5e108b8aca21244.hot-update.js",
+    "/js/main.fa0ec19ffbde25f400fe.hot-update.js": "/js/main.fa0ec19ffbde25f400fe.hot-update.js",
+    "/js/main.f1eff0b3168f092c9cf4.hot-update.js": "/js/main.f1eff0b3168f092c9cf4.hot-update.js",
+    "/js/main.6cf49fb10823bb054724.hot-update.js": "/js/main.6cf49fb10823bb054724.hot-update.js",
+    "/js/main.8e795c68414776eec78d.hot-update.js": "/js/main.8e795c68414776eec78d.hot-update.js",
+    "/js/main.27153a7815e5370bb4d9.hot-update.js": "/js/main.27153a7815e5370bb4d9.hot-update.js",
+    "/js/main.726962464ec4a7c39140.hot-update.js": "/js/main.726962464ec4a7c39140.hot-update.js",
+    "/js/main.0055e2fd997f2c1ec563.hot-update.js": "/js/main.0055e2fd997f2c1ec563.hot-update.js",
+    "/js/main.58ff92715d131de9f0b8.hot-update.js": "/js/main.58ff92715d131de9f0b8.hot-update.js",
+    "/js/main.5c1cf8d96717ff651abb.hot-update.js": "/js/main.5c1cf8d96717ff651abb.hot-update.js",
+    "/js/main.8e49785ccf37d1937a7c.hot-update.js": "/js/main.8e49785ccf37d1937a7c.hot-update.js",
+    "/js/main.235275b55fb8d743f50f.hot-update.js": "/js/main.235275b55fb8d743f50f.hot-update.js",
+    "/js/main.6abe082801559ee91419.hot-update.js": "/js/main.6abe082801559ee91419.hot-update.js",
+    "/js/main.fd96b2dae266ad9f84c3.hot-update.js": "/js/main.fd96b2dae266ad9f84c3.hot-update.js",
+    "/js/main.e7336bc082eb0c2f9a25.hot-update.js": "/js/main.e7336bc082eb0c2f9a25.hot-update.js",
+    "/js/main.fcbb88022321bac2a133.hot-update.js": "/js/main.fcbb88022321bac2a133.hot-update.js",
+    "/js/main.24a7cbde3771f8e06ed0.hot-update.js": "/js/main.24a7cbde3771f8e06ed0.hot-update.js",
+    "/js/main.cfe3a5ddd46f551b311a.hot-update.js": "/js/main.cfe3a5ddd46f551b311a.hot-update.js",
+    "/js/main.7e6223e27d420faece4a.hot-update.js": "/js/main.7e6223e27d420faece4a.hot-update.js",
+    "/js/main.e774ea59ce9ff87d05df.hot-update.js": "/js/main.e774ea59ce9ff87d05df.hot-update.js",
+    "/js/main.f56621e66dcb1684dc16.hot-update.js": "/js/main.f56621e66dcb1684dc16.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/DragUI.vue b/resources/js/components/FilesView/DragUI.vue
index 64e366e4..46f7b97a 100644
--- a/resources/js/components/FilesView/DragUI.vue
+++ b/resources/js/components/FilesView/DragUI.vue
@@ -26,7 +26,7 @@ import {events} from '@/bus'
                     return this.fileInfoDetail.length + ' ' + this.$tc('file_detail.items', this.fileInfoDetail.length)
                 }
 
-                if((this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.draggedItem)) && this.draggedItem ) {
+                if((this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.draggedItem)) && this.draggedItem && this.draggedItem.mimetype) {
                     return '.'+this.draggedItem.mimetype
                 }
             },
diff --git a/resources/js/components/Others/MoveItem.vue b/resources/js/components/Others/MoveItem.vue
index 9915c941..07ad6ffa 100644
--- a/resources/js/components/Others/MoveItem.vue
+++ b/resources/js/components/Others/MoveItem.vue
@@ -82,7 +82,10 @@
                 // Prevent empty submit
                 if (! this.selectedFolder) return
 
-                // Move item
+                //Prevent to move items to the same parent 
+                if(this.fileInfoDetail.find(item => item.parent_id === this.selectedFolder.unique_id)) return
+
+                // Move item 
                 if(!this.noSelectedItem){
                     this.$store.dispatch('moveItem', {to_item:this.selectedFolder ,noSelectedItem: null})
                 }