diff --git a/res/app/app.js b/res/app/app.js
index 5fda048a..f8123143 100644
--- a/res/app/app.js
+++ b/res/app/app.js
@@ -9,6 +9,7 @@ angular.module('app', [
   require('./layout').name,
   require('./device-list').name,
   require('./device-control').name,
+  require('./control-panes').name,
   require('./settings').name,
   require('./help').name
 ])
diff --git a/res/app/control-panes/control-panes.jade b/res/app/control-panes/control-panes.jade
index dd2410c5..5cedf76b 100644
--- a/res/app/control-panes/control-panes.jade
+++ b/res/app/control-panes/control-panes.jade
@@ -1,5 +1,5 @@
 div(pane, pane-anchor='west', pane-size='30% + 2px', pane-min='200px', pane-max='100% + 2px', pane-handle='4')
-  .stf-catch-all-keys(ng-controller='KeysCtrl')
+  //.stf-catch-all-keys(ng-controller='KeysCtrl')
     catch-all-keys(keys-down='keysDown($event)', keys-up='keysUp($event)')
   .remote-control
     //include control-screen
diff --git a/res/app/control-panes/index.js b/res/app/control-panes/index.js
index 3fc68180..022ffb7e 100644
--- a/res/app/control-panes/index.js
+++ b/res/app/control-panes/index.js
@@ -5,5 +5,11 @@ require('fa-borderlayout/build-0.3.1/stf-style.css')
 
 module.exports = angular.module('control-panes', [
 ])
+  .config(['$routeProvider', function ($routeProvider) {
+    $routeProvider.when('/control-panes', {
+      template: require('./control-panes.jade'),
+      controller: 'ControlPanesCtrl'
+    })
+  }])
   .factory('ControlPanesService', require('./control-panes-service'))
   .controller('ControlPanesCtrl', require('./control-panes-controller'))
diff --git a/res/app/device-control/index.js b/res/app/device-control/index.js
index 4be2f3e3..60e09358 100644
--- a/res/app/device-control/index.js
+++ b/res/app/device-control/index.js
@@ -3,7 +3,7 @@ require('./device-control.css')
 module.exports = angular.module('device-control', [
   require('stf/device').name,
   require('stf/control').name,
-  require('stf/screen').name,
+  require('stf/screen').name
 ])
   .config(['$routeProvider', function ($routeProvider) {
     $routeProvider.when('/devices/:serial', {