diff --git a/src/workspace.coffee b/src/workspace.coffee
index 8b8138b67..41bbc6b6d 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -77,16 +77,14 @@ class Workspace extends Model
     split = options.split
     uri = atom.project.relativize(uri) ? ''
 
-    pane = switch split
+    pane = @paneContainer.paneForUri(uri) if searchAllPanes
+    pane ?= switch split
       when 'left'
         @activePane.findLeftmostSibling()
       when 'right'
         @activePane.findOrCreateRightmostSibling()
       else
-        if searchAllPanes
-          @paneContainer.paneForUri(uri) ? @activePane
-        else
-          @activePane
+        @activePane
 
     @openUriInPane(uri, pane, options)