diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index c559a1cce..3e34ef28c 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -7,11 +7,13 @@ Project = require 'project'
 Directory = require 'directory'
 File = require 'file'
 RootView = require 'root-view'
+TextMateGrammar = require 'text-mate-grammar'
 fs = require 'fs'
 require 'window'
 $native.showDevTools()
 
 requireStylesheet "jasmine.css"
+TextMateGrammar.loadFromBundles()
 
 defaultTitle = document.title
 pathsWithSubscriptions = null
diff --git a/src/app/window.coffee b/src/app/window.coffee
index 93f748833..d507ab656 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -2,6 +2,7 @@
 # the DOM window.
 
 Native = require 'native'
+TextMateGrammar = require 'text-mate-grammar'
 fs = require 'fs'
 _ = require 'underscore'
 $ = require 'jquery'
@@ -30,6 +31,7 @@ windowAdditions =
       false
     $(window).focus()
     atom.windowOpened this
+    TextMateGrammar.loadFromBundles()
 
   shutdown: ->
     @rootView.deactivate()