diff --git a/packages/core/helper-plugin/lib/src/components/ReactSelect/ReactSelect.js b/packages/core/helper-plugin/lib/src/components/ReactSelect/ReactSelect.js
index 55645ed291..573d0e1ff5 100644
--- a/packages/core/helper-plugin/lib/src/components/ReactSelect/ReactSelect.js
+++ b/packages/core/helper-plugin/lib/src/components/ReactSelect/ReactSelect.js
@@ -11,7 +11,7 @@ import getSelectStyles from './utils/getSelectStyles';
 
 const ReactSelect = ({ components, styles, ...props }) => {
   const theme = useTheme();
-  const customStyles = getSelectStyles(theme);
+  const customStyles = getSelectStyles(theme, props);
 
   return (
     <Select
diff --git a/packages/core/helper-plugin/lib/src/components/ReactSelect/utils/getSelectStyles.js b/packages/core/helper-plugin/lib/src/components/ReactSelect/utils/getSelectStyles.js
index 852deeb975..295b1c503a 100644
--- a/packages/core/helper-plugin/lib/src/components/ReactSelect/utils/getSelectStyles.js
+++ b/packages/core/helper-plugin/lib/src/components/ReactSelect/utils/getSelectStyles.js
@@ -1,4 +1,4 @@
-const getSelectStyles = theme => {
+const getSelectStyles = (theme, { 'aria-errormessage': error }) => {
   return {
     clearIndicator: base => ({ ...base, padding: 0, paddingRight: theme.spaces[3] }),
     container: base => ({
@@ -13,6 +13,8 @@ const getSelectStyles = theme => {
 
       if (state.isFocused) {
         border = `1px solid ${theme.colors.primary600} !important`;
+      } else if (error) {
+        border = `1px solid ${theme.colors.danger600} !important`;
       } else {
         border = `1px solid ${theme.colors.neutral200} !important`;
       }
diff --git a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
index 5212cd7819..0268dd95e8 100644
--- a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
+++ b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
@@ -45,10 +45,10 @@ export const EditFolderDialog = ({ onClose, folder, parentFolderId }) => {
   const submitButtonRef = useRef(null);
   const [showConfirmDialog, setShowConfirmDialog] = useState(false);
   const { formatMessage, formatDate } = useIntl();
-  const { editFolder, isLoading: isEditFolderLoading } = useEditFolder();
+  const { editFolder } = useEditFolder();
   const { remove } = useBulkRemove();
   const toggleNotification = useNotification();
-  const isLoading = isLoadingPermissions || folderStructureIsLoading || isEditFolderLoading;
+  const isLoading = isLoadingPermissions || folderStructureIsLoading;
   const isEditing = !!folder;
   const formDisabled = (folder && !canUpdate) || (!folder && !canCreate);
   const initialFormData = !folderStructureIsLoading && {