diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee
index 9da0d7b90..74b05def1 100644
--- a/src/workspace-view.coffee
+++ b/src/workspace-view.coffee
@@ -84,7 +84,7 @@ class WorkspaceView extends View
     @panes.replaceWith(panes)
     @panes = panes
 
-    @subscribe @model, 'uri-opened', => @trigger 'uri-opened'
+    @subscribe @model.onDidAddPaneItem => @trigger 'uri-opened'
 
     @subscribe scrollbarStyle, (style) =>
       @removeClass('scrollbars-visible-always scrollbars-visible-when-scrolling')
diff --git a/src/workspace.coffee b/src/workspace.coffee
index 6f2003e8e..e8de5eeb0 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -73,7 +73,7 @@ class Workspace extends Model
       for scopeName in includedGrammarScopes ? []
         addGrammar(atom.syntax.grammarForScopeName(scopeName))
 
-    addGrammar(editor.getGrammar()) for editor in @getEditors()
+    addGrammar(editor.getGrammar()) for editor in @getTextEditors()
     _.uniq(packageNames)
 
   editorAdded: (editor) ->