1 files changed, 13 insertions, 0 deletions
diff --git a/src/pages/App.js b/src/pages/App.js
index 7f690002..98e2eac3 100644
--- a/src/pages/App.js
+++ b/src/pages/App.js
@@ -1,23 +1,36 @@
 import PropTypes from "prop-types";
 import React from 'react';
 import {connect} from "react-redux";
+import {ShortcutManager} from "react-shortcuts";
 import {openSimulationSucceeded} from "../actions/simulations";
 import {fetchLatestDatacenter} from "../actions/topology";
 import MapStage from "../components/map/MapStage";
 import AppNavbar from "../components/navigation/AppNavbar";
 import EditRoomNameModal from "../containers/modals/EditRoomNameModal";
 import TopologySidebar from "../containers/sidebars/topology/TopologySidebar";
+import KeymapConfiguration from "../shortcuts/keymap";
+
+const shortcutManager = new ShortcutManager(KeymapConfiguration);
 
 class AppContainer extends React.Component {
     static propTypes = {
         simulationId: PropTypes.number.isRequired,
     };
+    static childContextTypes = {
+        shortcuts: PropTypes.object.isRequired
+    };
 
     componentDidMount() {
         this.props.storeSimulationId(this.props.simulationId);
         this.props.fetchLatestDatacenter();
     }
 
+    getChildContext() {
+        return {
+            shortcuts: shortcutManager
+        }
+    }
+
     render() {
         return (
             <div className="page-container full-height">