diff --git a/src/contexts/RovingTabIndexContext.js b/src/accessibility/RovingTabIndex.js
similarity index 99%
rename from src/contexts/RovingTabIndexContext.js
rename to src/accessibility/RovingTabIndex.js
index 55ac19e40f..ad2051f1f1 100644
--- a/src/contexts/RovingTabIndexContext.js
+++ b/src/accessibility/RovingTabIndex.js
@@ -128,7 +128,7 @@ const reducer = (state, action) => {
     }
 };
 
-export const RovingTabIndexContextProvider = ({children}) => {
+export const RovingTabIndexProvider = ({children}) => {
     const [state, dispatch] = useReducer(reducer, {
         activeRef: null,
         refs: [],
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 775b6b69ce..2d41abf902 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -31,7 +31,7 @@ import PropTypes from 'prop-types';
 import RoomTile from "../views/rooms/RoomTile";
 import LazyRenderList from "../views/elements/LazyRenderList";
 import {_t} from "../../languageHandler";
-import {RovingTabIndexWrapper} from "../../contexts/RovingTabIndexContext";
+import {RovingTabIndexWrapper} from "../../accessibility/RovingTabIndex";
 
 // turn this on for drop & drag console debugging galore
 const debug = false;
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 488c1e20cf..3b15c6ff41 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -26,7 +26,7 @@ import classNames from 'classnames';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {RovingTabIndexWrapper} from "../../../contexts/RovingTabIndexContext";
+import {RovingTabIndexWrapper} from "../../../accessibility/RovingTabIndex";
 
 // XXX this class copies a lot from RoomTile.js
 export default createReactClass({
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 21cd1ed719..a137a36c60 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -39,7 +39,7 @@ import * as sdk from "../../../index";
 import * as Receipt from "../../../utils/Receipt";
 import {Resizer} from '../../../resizer';
 import {Layout, Distributor} from '../../../resizer/distributors/roomsublist2';
-import {RovingTabIndexContextProvider, RovingTabIndexHomeEndHelper} from "../../../contexts/RovingTabIndexContext";
+import {RovingTabIndexProvider, RovingTabIndexHomeEndHelper} from "../../../accessibility/RovingTabIndex";
 
 const HIDE_CONFERENCE_CHANS = true;
 const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
@@ -788,11 +788,11 @@ export default createReactClass({
                 onMouseMove={this.onMouseMove}
                 onMouseLeave={this.onMouseLeave}
             >
-                <RovingTabIndexContextProvider>
+                <RovingTabIndexProvider>
                     <RovingTabIndexHomeEndHelper>
                         { subListComponents }
                     </RovingTabIndexHomeEndHelper>
-                </RovingTabIndexContextProvider>
+                </RovingTabIndexProvider>
             </div>
         );
     },
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 8701c3d287..3b13001225 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -32,7 +32,7 @@ import ActiveRoomObserver from '../../../ActiveRoomObserver';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore from "../../../settings/SettingsStore";
 import {_t} from "../../../languageHandler";
-import {RovingTabIndexWrapper} from "../../../contexts/RovingTabIndexContext";
+import {RovingTabIndexWrapper} from "../../../accessibility/RovingTabIndex";
 
 export default createReactClass({
     displayName: 'RoomTile',