1 files changed, 11 insertions, 4 deletions
diff --git a/web-ui/src/common/back_link/back_link.js b/web-ui/src/common/back_link/back_link.js
index f3bdb2b5..bb5ffbea 100644
--- a/web-ui/src/common/back_link/back_link.js
+++ b/web-ui/src/common/back_link/back_link.js
@@ -19,12 +19,19 @@ import React from 'react';
 
 import './back_link.scss';
 
+const icon = <i className='fa fa-angle-left' aria-hidden='true' />;
+
+const button = (text, options) => (
+  <button className='link' {...options}>{icon}<span>{text}</span></button>
+);
+
+const link = (text, options) => (
+  <a className='link' {...options}>{icon}<span>{text}</span></a>
+);
+
 const BackLink = ({ text, ...other }) => (
   <div className='link-content'>
-    <a className='link' tabIndex='0' {...other}>
-      <i className='fa fa-angle-left' aria-hidden='true' />
-      <span>{text}</span>
-    </a>
+    { other.href ? link(text, other) : button(text, other) }
   </div>
 );