diff --git a/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx b/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx
index 1cbafa207111ee455695b4500ab601aa7d4344a3..21c8375b7fc430f595faf023467e2c8d43fb997e 100644
--- a/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx
+++ b/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx
@@ -130,6 +130,7 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => {
     style: containerStyle,
     className: containerClassName,
   } = actionButtons as DropzoneActions;
+
   const styleBorderRadius: string | number | undefined = style?.borderRadius;
 
   const {
@@ -195,7 +196,6 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => {
     localization,
     validateFilesFlag
   );
-
   /**
    * Uploads each file in the array of ExtFiles
    * First, sets all the files in preparing status and awaits `preparingTime` miliseconds.
@@ -570,7 +570,7 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => {
   // HANDLERS for CLICK, DRAG NAD DROP
   function handleClick(): void {
     //handleClickUtil(evt);
-    if (!clickable) return;
+    if (!clickable || disabled || isUploading) return;
     makeRipple();
     handleClickInput(inputRef.current);
   }
@@ -626,12 +626,12 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => {
 
     if (disabled) return;
 
+    if (isUploading) return;
+
     if (!disableRipple) makeRipple();
 
     setIsDragging(false);
 
-    if (isUploading) return;
-
     let fileList: FileList = evt.dataTransfer.files;
 
     let extFileListOutput: ExtFile[] = fileListToExtFileArray(fileList);