diff --git a/lib/tree-view-open-files-view.coffee b/lib/tree-view-open-files-view.coffee
index 22414ab..7f3cf58 100644
--- a/lib/tree-view-open-files-view.coffee
+++ b/lib/tree-view-open-files-view.coffee
@@ -1,4 +1,3 @@
-{requirePackages} = require 'atom-utils'
 {CompositeDisposable} = require 'event-kit'
 _ = require 'lodash'
 
@@ -6,18 +5,21 @@ TreeViewOpenFilesPaneView = require './tree-view-open-files-pane-view'
 
 module.exports =
 class TreeViewOpenFilesView
-	constructor: (serializeState) ->
+	constructor: (treeView) ->
+		@treeView = treeView
+
 		# Create root element
 		@element = document.createElement('div')
 		@element.classList.add('tree-view-open-files')
 		@groups = []
 		@paneSub = new CompositeDisposable
 		@paneSub.add atom.workspace.observePanes (pane) =>
-			@addTabGroup pane
-			destroySub = pane.onDidDestroy =>
-				destroySub.dispose()
-				@removeTabGroup pane
-			@paneSub.add destroySub
+			if(atom.workspace.isTextEditor(pane.getActiveItem()))
+				@addTabGroup pane
+				destroySub = pane.onDidDestroy =>
+					destroySub.dispose()
+					@removeTabGroup pane
+				@paneSub.add destroySub
 
 		@configSub = atom.config.observe 'tree-view-open-files.maxHeight', (maxHeight) =>
 			@element.style.maxHeight = if maxHeight > 0 then "#{maxHeight}px" else 'none'
@@ -33,9 +35,6 @@ class TreeViewOpenFilesView
 		@groups[group].destroy()
 		@groups.splice group, 1
 
-	# Returns an object that can be retrieved when package is activated
-	serialize: ->
-
 	# Tear down any state and detach
 	destroy: ->
 		@element.remove()
@@ -53,6 +52,4 @@ class TreeViewOpenFilesView
 		@element.remove()
 
 	show: ->
-		requirePackages('tree-view').then ([treeView]) =>
-			treeView.treeView.find('.tree-view-scroller').css 'background', treeView.treeView.find('.tree-view').css 'background'
-			treeView.treeView.prepend @element
+		@treeView.treeView.element.insertBefore(@element, @treeView.treeView.element.firstChild)
diff --git a/lib/tree-view-open-files.coffee b/lib/tree-view-open-files.coffee
index c31f2cb..440f36d 100644
--- a/lib/tree-view-open-files.coffee
+++ b/lib/tree-view-open-files.coffee
@@ -13,16 +13,13 @@ module.exports =
 
 	activate: (state) ->
 		requirePackages('tree-view').then ([treeView]) =>
-			@treeViewOpenFilesView = new TreeViewOpenFilesView
+			@treeViewOpenFilesView = new TreeViewOpenFilesView(treeView)
 
 			if treeView.treeView
 				@treeViewOpenFilesView.show()
 
 			atom.commands.add 'atom-workspace', 'tree-view:toggle', =>
-				if treeView.treeView?.is(':visible')
-					@treeViewOpenFilesView.show()
-				else
-					@treeViewOpenFilesView.hide()
+				@treeViewOpenFilesView.toggle()
 
 			atom.commands.add 'atom-workspace', 'tree-view:show', =>
 				@treeViewOpenFilesView.show()
@@ -31,4 +28,3 @@ module.exports =
 		@treeViewOpenFilesView.destroy()
 
 	serialize: ->
-		#TreeViewOpenFilesViewState: @TreeViewOpenFilesView.serialize()