diff --git a/src/common/Modal/Modal.js b/src/common/Modal/Modal.js
index df4a94fd7..b1e13ec6f 100644
--- a/src/common/Modal/Modal.js
+++ b/src/common/Modal/Modal.js
@@ -1,6 +1,12 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { FocusableProvider } from 'stremio-common';
 
-const Modal = (props) => ReactDOM.createPortal(<div {...props} />, document.body);
+const Modal = (props) => ReactDOM.createPortal(
+    <FocusableProvider>
+        <div {...props} />
+    </FocusableProvider>,
+    document.getElementById('app')
+);
 
 export default Modal;
diff --git a/src/common/Router/Router.js b/src/common/Router/Router.js
index ec07216d1..a5b5d8710 100644
--- a/src/common/Router/Router.js
+++ b/src/common/Router/Router.js
@@ -2,6 +2,7 @@ import React, { Component, Fragment } from 'react';
 import pathToRegexp from 'path-to-regexp';
 import PathUtils from 'path';
 import UrlUtils from 'url';
+import { FocusableProvider } from 'stremio-common';
 
 class Router extends Component {
     constructor(props) {
@@ -99,7 +100,11 @@ class Router extends Component {
                 {
                     this.state.views
                         .filter(({ element }) => React.isValidElement(element))
-                        .map(({ path, element }) => <div key={path} className={this.props.routeContainerClassName}>{element}</div>)
+                        .map(({ path, element }) => (
+                            <FocusableProvider key={path}>
+                                <div className={this.props.routeContainerClassName}>{element}</div>
+                            </FocusableProvider>
+                        ))
                 }
             </Fragment>
         );