diff --git a/src/common/ShareModal/ShareModal.js b/src/common/ShareModal/ShareModal.js
index 419c462f7..f69c8828e 100644
--- a/src/common/ShareModal/ShareModal.js
+++ b/src/common/ShareModal/ShareModal.js
@@ -27,10 +27,10 @@ const renderUrl = (url) => {
     return (
         <div className={styles['url-container']}>
             <input ref={inputRef} className={styles['url']} type={'text'} tabIndex={'-1'} defaultValue={url} readOnly />
-            <div className={styles['copy-button']} onClick={copyToClipboard}>
+            <Input className={styles['copy-button']} type={'button'} onClick={copyToClipboard}>
                 <Icon className={styles['icon']} icon={'ic_link'} />
                 <div className={styles['label']}>Copy</div>
-            </div>
+            </Input>
         </div>
     );
 };
@@ -39,9 +39,9 @@ const ShareModal = (props) => {
     return (
         <Modal>
             <div className={styles['share-modal']}>
-                <div className={styles['x-container']}>
+                <Input className={styles['x-container']} type={'button'}>
                     <Icon className={styles['icon']} icon={'ic_x'} onClick={props.onClose} />
-                </div>
+                </Input>
                 <div className={styles['info-container']}>
                     <div className={styles['share-label']}>Share</div>
                     <div className={styles['buttons']}>
diff --git a/src/common/ShareModal/styles.less b/src/common/ShareModal/styles.less
index 0dfbbd565..ca0b05022 100644
--- a/src/common/ShareModal/styles.less
+++ b/src/common/ShareModal/styles.less
@@ -16,8 +16,9 @@
         justify-content: flex-end;
 
         .icon {
-            width: 0.8em;
-            height: 0.8em;
+            padding: 0.2em;
+            width: 1.2em;
+            height: 1.2em;
             fill: var(--color-surfacedark);
             cursor: pointer;
 
@@ -25,10 +26,22 @@
                 fill: var(--color-surface);
             }
         }
+
+        &:focus {
+            .icon {
+                background-color: var(--color-surfacelight);
+            }
+        }
+
+        &:hover {
+            .icon {
+                background-color: transparent;
+            }
+        }
     }
 
     .info-container {
-        padding: calc(var(--spacing) * 0.2) var(--spacing) calc(var(--spacing) * 1.2) var(--spacing);
+        padding: 0 var(--spacing) calc(var(--spacing) * 1.2) var(--spacing);
 
         .share-label {
             font-size: 1.1em;
@@ -109,7 +122,7 @@
                     color: var(--color-surfacedarker);
                 }
 
-                &:hover {
+                &:focus, &:hover {
                     background-color: var(--color-surface60);
                 }
             }