diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee
index f01498b68..b1b0749b4 100644
--- a/src/tokenized-buffer.coffee
+++ b/src/tokenized-buffer.coffee
@@ -125,9 +125,14 @@ class TokenizedBuffer extends Model
     @disposables.add(@configSubscriptions)
 
     @retokenizeLines()
-    @emitter.emit 'did-use-grammar', grammar
+
     @emitter.emit 'did-change-grammar', grammar
 
+    # Delay this to the next tick to ensure whoever created the buffer has the
+    # change to listen for this event before we send it.
+    process.nextTick =>
+      @emitter.emit 'did-use-grammar', grammar
+
   onDidUseGrammar: (callback) ->
     @emitter.on 'did-use-grammar', callback