diff --git a/app/soapbox/components/column.js b/app/soapbox/components/column.js
index a8aec1542..1b5fabb05 100644
--- a/app/soapbox/components/column.js
+++ b/app/soapbox/components/column.js
@@ -11,6 +11,10 @@ export default class Column extends React.PureComponent {
     label: PropTypes.string,
   };
 
+  setRef = c => {
+    this.node = c;
+  }
+
   render() {
     const { className, label, children, transparent, ...rest } = this.props;
 
@@ -20,6 +24,7 @@ export default class Column extends React.PureComponent {
         aria-label={label}
         className={classNames('column', className, { 'column--transparent': transparent })}
         {...rest}
+        ref={this.setRef}
       >
         {children}
       </div>
diff --git a/app/soapbox/components/scrollable_list.js b/app/soapbox/components/scrollable_list.js
index 9617d1c68..4a2164b47 100644
--- a/app/soapbox/components/scrollable_list.js
+++ b/app/soapbox/components/scrollable_list.js
@@ -22,7 +22,7 @@ const mapStateToProps = state => {
   };
 };
 
-export default @connect(mapStateToProps)
+export default @connect(mapStateToProps, null, null, { forwardRef: true })
 class ScrollableList extends PureComponent {
 
   static contextTypes = {
diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js
index ad6b2b022..70cc1cd90 100644
--- a/app/soapbox/components/sidebar_menu.js
+++ b/app/soapbox/components/sidebar_menu.js
@@ -149,6 +149,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/soapbox/features/notifications/components/notification.js b/app/soapbox/features/notifications/components/notification.js
index 2470cc13b..b16d0b542 100644
--- a/app/soapbox/features/notifications/components/notification.js
+++ b/app/soapbox/features/notifications/components/notification.js
@@ -174,7 +174,7 @@ class Notification extends ImmutablePureComponent {
 
   renderMention(notification) {
     return (
-      <div className='notification notification-mention' tabIndex='0'>
+      <div className='notification notification-mention focusable-within' tabIndex='0'>
         <StatusContainer
           id={notification.getIn(['status', 'id'])}
           withDismiss
diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js
index 9b143b604..3fdf66d72 100644
--- a/app/soapbox/features/status/index.js
+++ b/app/soapbox/features/status/index.js
@@ -1,4 +1,4 @@
-import { OrderedSet as ImmutableOrderedSet } from 'immutable';
+import { List as ImmutableList, OrderedSet as ImmutableOrderedSet } from 'immutable';
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
@@ -425,10 +425,10 @@ class Status extends ImmutablePureComponent {
     if (id === status.get('id')) {
       this._selectChild(ancestorsIds.size - 1, true);
     } else {
-      let index = ancestorsIds.indexOf(id);
+      let index = ImmutableList(ancestorsIds).indexOf(id);
 
       if (index === -1) {
-        index = descendantsIds.indexOf(id);
+        index = ImmutableList(descendantsIds).indexOf(id);
         this._selectChild(ancestorsIds.size + index, true);
       } else {
         this._selectChild(index - 1, true);
@@ -442,10 +442,10 @@ class Status extends ImmutablePureComponent {
     if (id === status.get('id')) {
       this._selectChild(ancestorsIds.size + 1, false);
     } else {
-      let index = ancestorsIds.indexOf(id);
+      let index = ImmutableList(ancestorsIds).indexOf(id);
 
       if (index === -1) {
-        index = descendantsIds.indexOf(id);
+        index = ImmutableList(descendantsIds).indexOf(id);
         this._selectChild(ancestorsIds.size + index + 2, false);
       } else {
         this._selectChild(index + 1, false);
diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss
index 33231aa40..9e3a6951b 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/components/status.scss b/app/styles/components/status.scss
index 39fd6b49f..c8fd1e55b 100644
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@@ -472,15 +472,14 @@
   }
 }
 
-.focusable {
-  &:focus {
-    outline: 0;
-    box-shadow: 0 0 6px 0 hsla(var(--brand-color_hsl), 0.7);
+.focusable:focus,
+.focusable-within:focus-within {
+  outline: 0;
+  box-shadow: 0 0 6px 0 hsla(var(--brand-color_hsl), 0.7);
 
-    .status.status-direct {
-      &.muted {
-        background: transparent;
-      }
+  .status.status-direct {
+    &.muted {
+      background: transparent;
     }
   }
 }
diff --git a/app/styles/loading.scss b/app/styles/loading.scss
index 47b5d6941..b5ee78662 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 930991aec..87646cee0 100644
--- a/app/styles/navigation.scss
+++ b/app/styles/navigation.scss
@@ -158,6 +158,11 @@
     opacity: 0.6;
     font-size: 16px;
 
+    &:hover,
+    &:focus {
+      color: var(--primary-text-color);
+    }
+
     .svg-icon {
       margin-right: 7px;
       width: 26px;