diff --git a/spec/workspace-spec.coffee b/spec/workspace-spec.coffee
index 92d8e66c3..88bcdf49c 100644
--- a/spec/workspace-spec.coffee
+++ b/spec/workspace-spec.coffee
@@ -8,7 +8,11 @@ describe "Workspace", ->
     atom.workspace = workspace = new Workspace
 
   describe "::open(uri, options)", ->
+    openEvents = null
+
     beforeEach ->
+      openEvents = []
+      workspace.onDidOpen (event) -> openEvents.push(event)
       spyOn(workspace.getActivePane(), 'activate').andCallThrough()
 
     describe "when the 'searchAllPanes' option is false (default)", ->
@@ -24,6 +28,8 @@ describe "Workspace", ->
             expect(workspace.getActivePane().items).toEqual [editor1]
             expect(workspace.getActivePaneItem()).toBe editor1
             expect(workspace.getActivePane().activate).toHaveBeenCalled()
+            expect(openEvents).toEqual [{uri: undefined, pane: workspace.getActivePane(), item: editor1, index: 0}]
+            openEvents = []
 
           waitsForPromise ->
             workspace.open().then (editor) -> editor2 = editor
@@ -33,6 +39,7 @@ describe "Workspace", ->
             expect(workspace.getActivePane().items).toEqual [editor1, editor2]
             expect(workspace.getActivePaneItem()).toBe editor2
             expect(workspace.getActivePane().activate).toHaveBeenCalled()
+            expect(openEvents).toEqual [{uri: undefined, pane: workspace.getActivePane(), item: editor2, index: 1}]
 
       describe "when called with a uri", ->
         describe "when the active pane already has an editor for the given uri", ->
@@ -54,6 +61,27 @@ describe "Workspace", ->
               expect(workspace.getActivePaneItem()).toBe editor
               expect(workspace.getActivePane().activate).toHaveBeenCalled()
 
+              expect(openEvents).toEqual [
+                {
+                  uri: atom.project.resolve('a')
+                  item: editor1
+                  pane: atom.workspace.getActivePane()
+                  index: 0
+                }
+                {
+                  uri: atom.project.resolve('b')
+                  item: editor2
+                  pane: atom.workspace.getActivePane()
+                  index: 1
+                }
+                {
+                  uri: atom.project.resolve('a')
+                  item: editor1
+                  pane: atom.workspace.getActivePane()
+                  index: 0
+                }
+              ]
+
         describe "when the active pane does not have an editor for the given uri", ->
           it "adds and activates a new editor for the given path on the active pane", ->
             editor = null
diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee
index 27062e6b5..b4ae47318 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.onDidAddPaneItem => @trigger 'uri-opened'
+    @subscribe @model.onDidOpen => @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 e8de5eeb0..59dc2c0f2 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -5,6 +5,7 @@ _ = require 'underscore-plus'
 Q = require 'q'
 Serializable = require 'serializable'
 Delegator = require 'delegato'
+{Emitter} = require 'event-kit'
 Editor = require './editor'
 PaneContainer = require './pane-container'
 Pane = require './pane'
@@ -33,6 +34,7 @@ class Workspace extends Model
   constructor: ->
     super
 
+    @emitter = new Emitter
     @openers = []
 
     @paneContainer.onDidDestroyPaneItem(@onPaneItemDestroyed)
@@ -151,6 +153,9 @@ class Workspace extends Model
     callback(textEditor) for textEditor in @getTextEditors()
     @onDidAddTextEditor ({textEditor}) -> callback(textEditor)
 
+  onDidOpen: (callback) ->
+    @emitter.on 'did-open', callback
+
   eachEditor: (callback) ->
     deprecate("Use Workspace::observeTextEditors instead")
 
@@ -208,11 +213,11 @@ class Workspace extends Model
     pane = @paneContainer.paneForUri(uri) if searchAllPanes
     pane ?= switch split
       when 'left'
-        @activePane.findLeftmostSibling()
+        @getActivePane().findLeftmostSibling()
       when 'right'
-        @activePane.findOrCreateRightmostSibling()
+        @getActivePane().findOrCreateRightmostSibling()
       else
-        @activePane
+        @getActivePane()
 
     @openUriInPane(uri, pane, options)
 
@@ -266,7 +271,9 @@ class Workspace extends Model
         @itemOpened(item)
         pane.activateItem(item)
         pane.activate() if changeFocus
+        index = pane.getActiveItemIndex()
         @emit "uri-opened"
+        @emitter.emit 'did-open', {uri, pane, item, index}
         item
       .catch (error) ->
         console.error(error.stack ? error)