diff --git a/src/AjaxUploader.tsx b/src/AjaxUploader.tsx
index 0244c3be..62f61b77 100644
--- a/src/AjaxUploader.tsx
+++ b/src/AjaxUploader.tsx
@@ -368,10 +368,15 @@ class AjaxUploader extends Component<UploadProps> {
           onMouseLeave,
           onDrop: this.onFileDrop,
           onDragOver: this.onFileDragOver,
-          tabIndex: hasControlInside ? undefined : '0',
+          tabIndex: hasControlInside || !openFileDialogOnClick ? undefined : '0',
         };
     return (
-      <Tag {...events} className={cls} role={hasControlInside ? undefined : 'button'} style={style}>
+      <Tag
+        {...events}
+        className={cls}
+        role={hasControlInside || !openFileDialogOnClick ? undefined : 'button'}
+        style={style}
+      >
         <input
           {...pickAttrs(otherProps, { aria: true, data: true })}
           id={id}
diff --git a/tests/uploader.spec.tsx b/tests/uploader.spec.tsx
index ef835041..89d5deb4 100644
--- a/tests/uploader.spec.tsx
+++ b/tests/uploader.spec.tsx
@@ -1320,6 +1320,13 @@ describe('uploader', () => {
     expect(container.querySelector('span')!).not.toHaveAttribute('role', 'button');
   });
 
+  it("Should not be focusable and doesn't have role=button when click upload is disabled", () => {
+    const { container } = render(<Upload openFileDialogOnClick={false} />);
+
+    expect(container.querySelector('span')!.tabIndex).not.toBe(0);
+    expect(container.querySelector('span')!).not.toHaveAttribute('role', 'button');
+  });
+
   it('should receive same defaultRequest as src', done => {
     const { default: srcRequest } = require('../src/request');
     let receivedDefaultRequest: any;