diff --git a/src/components/Editor/MediaUploader/index.jsx b/src/components/Editor/MediaUploader/index.jsx
index c5630515..819f018b 100644
--- a/src/components/Editor/MediaUploader/index.jsx
+++ b/src/components/Editor/MediaUploader/index.jsx
@@ -55,7 +55,7 @@ const MediaUploader = ({ mediaUploader, onClose, editor, unsplashApiKey }) => {
     <Modal
       {...{ isOpen }}
       className="ne-media-uploader-modal"
-      closeButton={false}
+      closeButton={not(isUploading)}
       closeOnOutsideClick={not(isUploading)}
       onClose={handleClose}
     >
diff --git a/src/styles/editor/_media-uploader.scss b/src/styles/editor/_media-uploader.scss
index 505ac850..bf3b59b0 100644
--- a/src/styles/editor/_media-uploader.scss
+++ b/src/styles/editor/_media-uploader.scss
@@ -12,6 +12,7 @@
 
   .neeto-ui-tab__wrapper {
     padding: 0 16px;
+    margin-top: 1.2rem;
   }
 
   .ne-tab__wrapper {