diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js
index d12c50b13..cc3e8bf4b 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/frontend/controllers/editor.js
@@ -15,25 +15,6 @@ angular.module('app.frontend')
       bindToController: true,
 
       link:function(scope, elem, attrs, ctrl) {
-
-        var handler = function(event) {
-          if (event.ctrlKey || event.metaKey) {
-              switch (String.fromCharCode(event.which).toLowerCase()) {
-              case 'o':
-                  event.preventDefault();
-                  $timeout(function(){
-                    ctrl.toggleFullScreen();
-                  })
-                  break;
-              }
-          }
-        };
-
-        window.addEventListener('keydown', handler);
-        scope.$on('$destroy', function(){
-          window.removeEventListener('keydown', handler);
-        })
-
         scope.$watch('ctrl.note', function(note, oldNote){
           if(note) {
             ctrl.setNote(note, oldNote);
diff --git a/app/assets/templates/frontend/editor.html.haml b/app/assets/templates/frontend/editor.html.haml
index e8956bb3b..f16bfb3ed 100644
--- a/app/assets/templates/frontend/editor.html.haml
+++ b/app/assets/templates/frontend/editor.html.haml
@@ -19,7 +19,6 @@
         %ul.dropdown-menu.dropdown-menu-left.nt-dropdown-menu.dark{"ng-if" => "ctrl.showMenu"}
           %li{"ng-click" => "ctrl.selectedMenuItem(); ctrl.toggleFullScreen()"}
             .text Toggle Fullscreen
-            .shortcut Cmd + O
           %li{"ng-click" => "ctrl.deleteNote()"}
             .text Delete