Fixed #13118

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Fixed a bug where relational field values weren’t yielding any results for event handlers immediately after a draft had been merged. ([#13087](https://github.com/craftcms/cms/issues/13087))
 - Fixed a bug where element labels could bleed out of their container. ([#13099](https://github.com/craftcms/cms/issues/13099))
 - Fixed an error that occurred if `yii\web\UrlManager::addRules()` was called on a console request. ([#13109](https://github.com/craftcms/cms/issues/13109))
+- Fixed a bug where it was possible to select the current folder as the target when moving a volume folder, resulting in the folder and its contents being lost. ([#13118](https://github.com/craftcms/cms/issues/13118))
 
 ## 3.8.7 - 2023-04-11
 

src/web/assets/cp/src/js/VolumeFolderSelectorModal.js

@@ -57,7 +57,12 @@ Craft.VolumeFolderSelectorModal = Craft.BaseElementSelectorModal.extend(
     getIndexSettings: function () {
       return Object.assign(this.base(), {
         foldersOnly: true,
-        canSelectElement: () => true,
+        canSelectElement: ($element) => {
+          const folderId = $element.find('.element:first').data('folder-id');
+          return (
+            folderId && !this.settings.disabledFolderIds.includes(folderId)
+          );
+        },
       });
     },
   },