diff --git a/lib/git-control.coffee b/lib/git-control.coffee
index 03e47de..eb12fc9 100644
--- a/lib/git-control.coffee
+++ b/lib/git-control.coffee
@@ -9,6 +9,7 @@ views = []
 view = undefined
 pane = undefined
 item = undefined
+lastItem = undefined
 
 module.exports = GitControl =
 
@@ -26,21 +27,28 @@ module.exports = GitControl =
 
   toggleView: ->
     console.log 'GitControl: toggle'
+    pane = atom.workspace.getActivePane()
 
     unless view and view.active
+      lastItem = pane.getActiveItem()
+
       view = new GitControlView()
       views.push view
 
-      pane = atom.workspace.getActivePane()
       item = pane.addItem view, 0
 
       pane.activateItem item
+      view.compareMenuClick()
 
     else
       pane.destroyItem item
+      pane.activateItem lastItem
+      pane.activate()
+
 
     return
 
+
   updatePaths: ->
      git.setProjectIndex(0)
      return