diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js
index 86d8af697..b5b90fdd1 100644
--- a/app/soapbox/components/sidebar_menu.js
+++ b/app/soapbox/components/sidebar_menu.js
@@ -141,6 +141,10 @@ class SidebarMenu extends ImmutablePureComponent {
     if (accountChanged || otherAccountsChanged) {
       this.fetchOwnAccounts();
     }
+
+    if (this.props.sidebarOpen && !prevProps.sidebarOpen) {
+      document.querySelector('.sidebar-menu__close').focus();
+    }
   }
 
   renderAccount = account => {
diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss
index 69902227c..b09ec1c65 100644
--- a/app/styles/components/account-header.scss
+++ b/app/styles/components/account-header.scss
@@ -202,7 +202,8 @@
         padding: 7px;
         opacity: 0.6;
 
-        &:hover {
+        &:hover,
+        &:focus {
           opacity: 1;
         }
 
diff --git a/app/styles/loading.scss b/app/styles/loading.scss
index be819b892..32000e89e 100644
--- a/app/styles/loading.scss
+++ b/app/styles/loading.scss
@@ -173,7 +173,8 @@
   clear: both;
   text-decoration: none;
 
-  &:hover {
+  &:hover,
+  &:focus {
     background: var(--brand-color--faint);
   }
 }
diff --git a/app/styles/navigation.scss b/app/styles/navigation.scss
index d4042d052..623f59de2 100644
--- a/app/styles/navigation.scss
+++ b/app/styles/navigation.scss
@@ -154,6 +154,11 @@
     justify-content: center;
     color: var(--primary-text-color--faint);
 
+    &:hover,
+    &:focus {
+      color: var(--primary-text-color);
+    }
+
     .svg-icon {
       margin-right: 7px;
       width: 22px;