From d5134cb3ee4d11b31762f3c294e8b7371578aaee Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Wed, 11 May 2022 15:13:36 +0200
Subject: [PATCH] EditFolderDialog: Fix creating folders at the root level

---
 .../components/EditFolderDialog/EditFolderDialog.js    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
index 3ff9517f86..214a6d847e 100644
--- a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
+++ b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
@@ -43,14 +43,14 @@ export const EditFolderDialog = ({ onClose, folder, folderStructure }) => {
   const toggleNotification = useNotification();
   const [{ query }] = useQueryParams();
   const isEditing = !!folder;
-  const activeFolderId = folder?.parent?.id ?? query?.folder ?? folderStructure[0].value;
+  const activeFolderId = folder?.parent?.id ?? query?.folder;
 
   const initialFormData = Object.assign({}, folder, {
     parent: {
-      value: parseInt(activeFolderId, 10),
-      label:
-        findRecursiveFolderByValue(folderStructure, parseInt(activeFolderId, 10))?.label ??
-        folderStructure[0].label,
+      value: activeFolderId ? parseInt(activeFolderId, 10) : folderStructure[0].value,
+      label: activeFolderId
+        ? findRecursiveFolderByValue(folderStructure, parseInt(activeFolderId, 10))?.label
+        : folderStructure[0].label,
     },
   });