diff --git a/src/window.coffee b/src/window.coffee
index f54d8fd44..72c29d1ec 100644
--- a/src/window.coffee
+++ b/src/window.coffee
@@ -36,8 +36,8 @@ window.setUpEnvironment = (windowMode) ->
 # This should only be called after setUpEnvironment() has been called.
 window.setUpDefaultEvents = ->
   windowEventHandler = new WindowEventHandler
-  keymap.loadBundledKeymaps()
-  ipc.sendChannel 'update-application-menu', keymap.keystrokesByCommandForSelector('body')
+  atom.keymap.loadBundledKeymaps()
+  ipc.sendChannel 'update-application-menu', atom.keymap.keystrokesByCommandForSelector('body')
 
 # This method is only called when opening a real application window
 window.startEditorWindow = ->