diff --git a/app/components/file-editor-column.js b/app/components/file-editor-column.js
index d5730ef8..b3207ad1 100644
--- a/app/components/file-editor-column.js
+++ b/app/components/file-editor-column.js
@@ -16,7 +16,7 @@ export default Em.Component.extend({
   }),
 
   focusIn () {
-    this.sendAction('focusEditor', this.get('col'));
+    this.sendAction('focusEditor', this);
   },
 
   actions: {
diff --git a/app/gist/controller.js b/app/gist/controller.js
index 54229691..9c9f9e08 100644
--- a/app/gist/controller.js
+++ b/app/gist/controller.js
@@ -76,8 +76,9 @@ export default Em.Controller.extend({
   }),
 
   actions: {
-    focusEditor (editorCol) {
-      this.set('activeEditorCol', editorCol);
+    focusEditor (editor) {
+      this.set('activeEditorCol', editor.get('col'));
+      this.set('activeFile', editor.get('file'));
     },
 
     selectFile (file) {