diff --git a/Atom/src/Atom.mm b/Atom/src/Atom.mm
index 84acbaad8..d8ebe4d73 100755
--- a/Atom/src/Atom.mm
+++ b/Atom/src/Atom.mm
@@ -40,8 +40,7 @@
 
   if ([[self mainMenu] performKeyEquivalent:event]) return;
   
-  bool windowHandlesKeyEvents = [[[self keyWindow] windowController] handlesKeyEvents];
-  if (_clientHandler && !windowHandlesKeyEvents && [event type] == NSKeyDown) {
+  if (_clientHandler && ![self keyWindow] && [event type] == NSKeyDown) {
     [_hiddenWindow makeKeyAndOrderFront:self];
     [_hiddenWindow sendEvent:event];
   }
diff --git a/Atom/src/AtomController.h b/Atom/src/AtomController.h
index a9853c827..fd630dc11 100644
--- a/Atom/src/AtomController.h
+++ b/Atom/src/AtomController.h
@@ -9,8 +9,6 @@ class ClientHandler;
   NSView *_webView;
   NSString *_bootstrapScript;
   NSString *_pathToOpen;
-
-  bool _handlesKeyEvents;
   
   CefRefPtr<CefV8Context> _atomContext;
   CefRefPtr<ClientHandler> _clientHandler;
@@ -19,7 +17,6 @@ class ClientHandler;
 - (id)initWithBootstrapScript:(NSString *)bootstrapScript atomContext:(CefRefPtr<CefV8Context>) context;
 - (id)initWithPath:(NSString *)path atomContext:(CefRefPtr<CefV8Context>)atomContext;
 - (id)initSpecsWithAtomContext:(CefRefPtr<CefV8Context>)atomContext;
-- (bool)handlesKeyEvents;
 
 - (void)createBrowser;
 
diff --git a/Atom/src/AtomController.mm b/Atom/src/AtomController.mm
index 7d3ea1450..f07edbd2a 100644
--- a/Atom/src/AtomController.mm
+++ b/Atom/src/AtomController.mm
@@ -29,12 +29,10 @@
 
 - (id)initWithPath:(NSString *)path atomContext:(CefRefPtr<CefV8Context>)atomContext {
   _pathToOpen = [path retain];
-  _handlesKeyEvents = YES;
   return [self initWithBootstrapScript:@"window-bootstrap" atomContext:atomContext];
 }
 
 - (id)initSpecsWithAtomContext:(CefRefPtr<CefV8Context>)atomContext {
-  _handlesKeyEvents = NO;
   return [self initWithBootstrapScript:@"spec-bootstrap" atomContext:atomContext];
 }
 
@@ -58,10 +56,6 @@
   CefBrowser::CreateBrowser(window_info, _clientHandler.get(), [indexURLString UTF8String], settings);  
 }
 
-- (bool)handlesKeyEvents {
-  return _handlesKeyEvents;
-}
-
 #pragma mark BrowserDelegate
 
 - (void)loadStart {