diff --git a/src/browser.coffee b/src/browser.coffee
index 7439899c0..77dad6804 100644
--- a/src/browser.coffee
+++ b/src/browser.coffee
@@ -1,9 +1,15 @@
 $ = require 'jquery'
 
+Event = require 'event'
+
 module.exports =
 class Browser
   constructor: (@path) ->
     $('.main.pane').append @html().hide()
+
+    Event.on "editor:bufferFocus", (e) =>
+      @hide() if e.details isnt @path
+
   on: ->
   html: ->
     $ "<iframe src='#{@path}' style='width:100%;height:100%'></iframe>"
diff --git a/src/editor.coffee b/src/editor.coffee
index 1cb885718..0daabd191 100644
--- a/src/editor.coffee
+++ b/src/editor.coffee
@@ -156,7 +156,6 @@ class Editor
     @activePath = path
 
     buffer = @buffers[path] or @addBuffer path
-    $("iframe").hide()
     if buffer.constructor is EditSession
       $('#ace-editor').show()
       @ace.setSession buffer