diff --git a/frontend/src/pages/upload-link/upload-list-item.js b/frontend/src/pages/upload-link/upload-list-item.js
index 1b8872eedf..e8995af4ff 100644
--- a/frontend/src/pages/upload-link/upload-list-item.js
+++ b/frontend/src/pages/upload-link/upload-list-item.js
@@ -121,10 +121,10 @@ class UploadListItem extends React.Component {
         <td className="upload-operation">
           <Fragment>
             {this.state.uploadState === UPLOAD_UPLOADING && (
-              <a href="#" onClick={this.onUploadCancel}>{gettext('Cancel')}</a>
+              <a href="#" onClick={this.onUploadCancel} role="button">{gettext('Cancel')}</a>
             )}
             {this.state.uploadState === UPLOAD_ERROR && (
-              <a href="#" onClick={this.onUploadRetry}>{gettext('Retry')}</a>
+              <a href="#" onClick={this.onUploadRetry} role="button">{gettext('Retry')}</a>
             )}
             {this.state.uploadState === UPLOAD_ISSAVING && (
               <span className="saving">{gettext('Saving...')}</span>
diff --git a/frontend/src/pages/upload-link/upload-progress-dialog.js b/frontend/src/pages/upload-link/upload-progress-dialog.js
index b52dea27fd..a104ebf95e 100644
--- a/frontend/src/pages/upload-link/upload-progress-dialog.js
+++ b/frontend/src/pages/upload-link/upload-progress-dialog.js
@@ -31,16 +31,28 @@ class UploadProgressDialog extends React.Component {
     });
   }
 
+  onDropdownToggleKeyDown = (e) => {
+    if (e.key == 'Enter' || e.key == 'Space') {
+      this.toggleDropdown();
+    }
+  }
+
+  onMenuItemKeyDown = (e) => {
+    if (e.key == 'Enter' || e.key == 'Space') {
+      e.target.click();
+    }
+  }
+
   render() {
     let { allFilesUploaded } = this.props;
     return (
       <Fragment>
         <div className="text-center">
           <ButtonDropdown isOpen={this.state.dropdownOpen} toggle={this.toggleDropdown}>
-            <DropdownToggle color="primary" caret>{gettext('Upload')}</DropdownToggle>
+            <DropdownToggle color="primary" caret onKeyDown={this.onDropdownToggleKeyDown}>{gettext('Upload')}</DropdownToggle>
             <DropdownMenu>
-              <DropdownItem onClick={this.props.onFileUpload}>{gettext('Upload Files')}</DropdownItem>
-              <DropdownItem onClick={this.props.onFolderUpload}>{gettext('Upload Folder')}</DropdownItem>
+              <DropdownItem onClick={this.props.onFileUpload} onKeyDown={this.onMenuItemKeyDown}>{gettext('Upload Files')}</DropdownItem>
+              <DropdownItem onClick={this.props.onFolderUpload} onKeyDown={this.onMenuItemKeyDown}>{gettext('Upload Folder')}</DropdownItem>
             </DropdownMenu>
           </ButtonDropdown>
           <Button color="primary" outline={true} className="ml-4"