diff --git a/web/app/common/accessibility.js b/web/app/common/accessibility.js
index c4bf4ab2..35d7f1c7 100644
--- a/web/app/common/accessibility.js
+++ b/web/app/common/accessibility.js
@@ -7,7 +7,7 @@ const handleBtnKeyPress = (event, handler) => {
 
 export const getHandleClickProps = handler => ({
   role: 'button',
-  tabIndex: 0,
   onClick: handler,
   onKeyPress: event => handleBtnKeyPress(event, handler),
+  ...(handler ? { tabIndex: 0 } : {}),
 });