diff --git a/src/workspace.coffee b/src/workspace.coffee
index f64f58ee0..a90d314f7 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -483,6 +483,8 @@ class Workspace extends Model
 
     Promise.resolve(item)
       .then (item) =>
+        return item if pane.isDestroyed()
+
         @itemOpened(item)
         pane.activateItem(item) if activateItem
         pane.activate() if activatePane