diff --git a/src/window-bootstrap.coffee b/src/window-bootstrap.coffee
index 42ec7cd91..1d10628e0 100644
--- a/src/window-bootstrap.coffee
+++ b/src/window-bootstrap.coffee
@@ -9,3 +9,9 @@ atom.initialize()
 atom.startEditorWindow()
 window.atom.loadTime = Date.now() - startTime
 console.log "Window load time: #{atom.getWindowLoadTime()}ms"
+
+# Workaround for focus getting cleared upon window creation
+windowFocused = (e) ->
+  window.removeEventListener('focus', windowFocused)
+  setTimeout (-> document.querySelector('.workspace').focus()), 0
+window.addEventListener('focus', windowFocused)