diff --git a/src/app/pane-container.coffee b/src/app/pane-container.coffee
index adac275b6..1e179c085 100644
--- a/src/app/pane-container.coffee
+++ b/src/app/pane-container.coffee
@@ -37,7 +37,13 @@ class PaneContainer extends View
     @children().first().view()
 
   getPanes: ->
-    @find('.pane').toArray().map (node)-> $(node).view()
+    @find('.pane').views()
+
+  indexOfPane: (pane) ->
+    @getPanes().indexOf(pane.view())
+
+  paneAtIndex: (index) ->
+    @getPanes()[index]
 
   eachPane: (callback) ->
     callback(pane) for pane in @getPanes()
diff --git a/src/app/root-view.coffee b/src/app/root-view.coffee
index 4515f50e2..83bedbf86 100644
--- a/src/app/root-view.coffee
+++ b/src/app/root-view.coffee
@@ -171,6 +171,12 @@ class RootView extends View
   eachPane: (callback) ->
     @panes.eachPane(callback)
 
+  getPanes: ->
+    @panes.getPanes()
+
+  indexOfPane: (pane) ->
+    @panes.indexOfPane(pane)
+
   eachEditor: (callback) ->
     callback(editor) for editor in @getEditors()
     @on 'editor:attached', (e, editor) -> callback(editor)
@@ -181,10 +187,3 @@ class RootView extends View
   eachBuffer: (callback) ->
     project.eachBuffer(callback)
 
-  indexOfPane: (pane) ->
-    index = -1
-    for p, idx in @panes.find('.pane')
-      if pane.is(p)
-        index = idx
-        break
-    index