diff --git a/app/soapbox/components/button.js b/app/soapbox/components/button.js
index 6705b77df..214ce7b53 100644
--- a/app/soapbox/components/button.js
+++ b/app/soapbox/components/button.js
@@ -66,7 +66,7 @@ export default class Button extends React.PureComponent {
 
     if (this.props.to) {
       return (
-        <Link to={this.props.to}>
+        <Link to={this.props.to} tabIndex={-1}>
           {btn}
         </Link>
       );
diff --git a/app/soapbox/components/modal_root.js b/app/soapbox/components/modal_root.js
index 1ffb12d3c..96de00f1c 100644
--- a/app/soapbox/components/modal_root.js
+++ b/app/soapbox/components/modal_root.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import 'wicg-inert';
 import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
 import { connect } from 'react-redux';
 import { openModal } from '../actions/modal';
diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss
index 55386987a..cc3cbd95e 100644
--- a/app/styles/components/account-header.scss
+++ b/app/styles/components/account-header.scss
@@ -221,6 +221,7 @@
         }
 
         &:hover,
+        &:focus,
         &.active {
           border-bottom: 2px solid var(--primary-text-color);
         }
diff --git a/package.json b/package.json
index cc252e867..6ce9d397e 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,8 @@
     "webpack-bundle-analyzer": "^4.0.0",
     "webpack-cli": "^3.3.2",
     "webpack-merge": "^5.2.0",
-    "websocket.js": "^0.1.12"
+    "websocket.js": "^0.1.12",
+    "wicg-inert": "^3.1.1"
   },
   "devDependencies": {
     "axios-mock-adapter": "^1.18.1",
diff --git a/yarn.lock b/yarn.lock
index 031ea8ab9..edbe92d7d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13062,6 +13062,11 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
+wicg-inert@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.1.tgz#b033fd4fbfb9e3fd709e5d84becbdf2e06e5c229"
+  integrity sha512-PhBaNh8ur9Xm4Ggy4umelwNIP6pPP1bv3EaWaKqfb/QNme2rdLjm7wIInvV4WhxVHhzA4Spgw9qNSqWtB/ca2A==
+
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"