diff --git a/src/atom/app.coffee b/src/atom/app.coffee
index fa8f8e239..39ea52cc4 100644
--- a/src/atom/app.coffee
+++ b/src/atom/app.coffee
@@ -15,8 +15,8 @@ class App
 
   setupKeymap: ->
     @keymap = new GlobalKeymap()
-
     $(document).on 'keydown', (e) => @keymap.handleKeyEvent(e)
+    @keymap.bindDefaultKeys()
 
   open: (url) ->
     $native.open url
diff --git a/src/atom/global-keymap.coffee b/src/atom/global-keymap.coffee
index 1fe11643c..ec1eaf14e 100644
--- a/src/atom/global-keymap.coffee
+++ b/src/atom/global-keymap.coffee
@@ -9,15 +9,15 @@ class GlobalKeymap
   constructor: ->
     @bindingSets = []
 
+  bindDefaultKeys: ->
     @bindKeys "*",
       'meta-n': 'newWindow'
       'meta-o': 'open'
 
     $(document).on 'newWindow', => $native.newWindow()
-    $(document).on 'open', => 
+    $(document).on 'open', =>
       url = $native.openDialog()
       atom.open(url) if url
-  
 
   bindKeys: (selector, bindings) ->
     @bindingSets.unshift(new BindingSet(selector, bindings))
@@ -29,7 +29,7 @@ class GlobalKeymap
 
   handleKeyEvent: (event) ->
     event.keystroke = @keystrokeStringForEvent(event)
-    currentNode = $(event.target)    
+    currentNode = $(event.target)
     while currentNode.length
       candidateBindingSets = @bindingSets.filter (set) -> currentNode.is(set.selector)
       candidateBindingSets.sort (a, b) -> b.specificity - a.specificity
diff --git a/src/atom/window.coffee b/src/atom/window.coffee
index d9d1c95cb..ddb2c5f64 100644
--- a/src/atom/window.coffee
+++ b/src/atom/window.coffee
@@ -15,11 +15,11 @@ windowAdditions =
   startup: (url) ->
     @setupKeymap()
     @attachRootView(url)
-    
-    $(window).on 'close', => 
+
+    $(window).on 'close', =>
       @shutdown()
       @close()
-    
+
     $(window).focus()
     atom.windowOpened this
 
@@ -31,7 +31,7 @@ windowAdditions =
 
   setupKeymap: ->
     @keymap = new GlobalKeymap()
-
+    @keymap.bindDefaultKeys()
     $(document).on 'keydown', (e) => @keymap.handleKeyEvent(e)
 
   attachRootView: (url) ->