diff --git a/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js b/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js
index 279c472f0e..382bd500c5 100644
--- a/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js
+++ b/scm-ui-components/packages/ui-components/src/buttons/DownloadButton.js
@@ -3,14 +3,17 @@ import React from "react";
 
 type Props = {
   displayName: string,
-  url: string
+  url: string,
+  disabled: boolean,
+  onClick?: () => void
 };
 
 class DownloadButton extends React.Component<Props> {
   render() {
-    const { displayName, url } = this.props;
+    const { displayName, url, disabled, onClick } = this.props;
+    const onClickOrDefault = !!onClick ? onClick : () => {};
     return (
-      <a className="button is-large is-link" href={url}>
+      <a className="button is-large is-link" href={url} disabled={disabled} onClick={onClickOrDefault}>
         <span className="icon is-medium">
           <i className="fas fa-arrow-circle-down" />
         </span>