diff --git a/packages/strapi-plugin-upload/admin/src/components/EditForm/FileWrapper.js b/packages/strapi-plugin-upload/admin/src/components/EditForm/FileWrapper.js
index 26b3b63ebc..1551f16380 100644
--- a/packages/strapi-plugin-upload/admin/src/components/EditForm/FileWrapper.js
+++ b/packages/strapi-plugin-upload/admin/src/components/EditForm/FileWrapper.js
@@ -1,5 +1,6 @@
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
+import { themePropTypes } from 'strapi-helper-plugin';
 
 import CardImgWrapper from '../CardImgWrapper';
 
@@ -9,7 +10,7 @@ const FileWrapper = styled(CardImgWrapper)`
   display: flex;
   position: relative;
   background-color: ${({ theme }) => theme.main.colors.black};
-  ${({ hasError, theme }) => hasError && `border: 2px solid ${theme.main.colors.orange}`};
+  ${({ hasError, theme }) => hasError && `border: 2px solid ${theme.main.colors.orange};`}
 
   .cropper-view-box {
     outline-color: ${({ theme }) => theme.main.colors.white};
@@ -34,6 +35,7 @@ FileWrapper.defaultProps = {
 
 FileWrapper.propTypes = {
   hasError: PropTypes.bool,
+  ...themePropTypes,
 };
 
 export default FileWrapper;
diff --git a/packages/strapi-plugin-upload/admin/src/containers/InputModalStepperProvider/reducer.js b/packages/strapi-plugin-upload/admin/src/containers/InputModalStepperProvider/reducer.js
index 884a516278..86de009c79 100644
--- a/packages/strapi-plugin-upload/admin/src/containers/InputModalStepperProvider/reducer.js
+++ b/packages/strapi-plugin-upload/admin/src/containers/InputModalStepperProvider/reducer.js
@@ -232,7 +232,7 @@ const reducer = (state, action) =>
         break;
       }
       case 'ON_SUBMIT_EDIT_EXISTING_FILE': {
-        draftState.fileToEdit.isUploading = false;
+        draftState.fileToEdit.isUploading = true;
         break;
       }
       case 'SET_FILE_TO_EDIT_ERROR': {