diff --git a/assets/javascripts/app/controllers.coffee b/assets/javascripts/app/controllers.coffee
index 9c4de3be..4f32f94c 100644
--- a/assets/javascripts/app/controllers.coffee
+++ b/assets/javascripts/app/controllers.coffee
@@ -13,6 +13,19 @@ Travis.reopen
       @connectOutlet(outletName: 'top', controller: @topController, viewClass: Travis.TopView)
       @topController.set('tab', @get('name'))
 
+    connectOutlet: ->
+      view = @_super.apply(this, arguments)
+
+      if view
+        _connectedOutletViews = Travis.app.get('_connectedOutletViews')
+        unless _connectedOutletViews
+          _connectedOutletViews = []
+
+        _connectedOutletViews.pushObject(view)
+        Travis.app.set('_connectedOutletViews', _connectedOutletViews)
+
+      view
+
   # TopController: Em.Controller.extend
   #   userBinding: 'Travis.app.currentUser'
 
diff --git a/assets/javascripts/spec/spec_helper.coffee b/assets/javascripts/spec/spec_helper.coffee
index 16e97958..f7e958ae 100644
--- a/assets/javascripts/spec/spec_helper.coffee
+++ b/assets/javascripts/spec/spec_helper.coffee
@@ -2,7 +2,13 @@ minispade.require 'app'
 
 @reset = ->
   Em.run ->
-    Travis.app.destroy() if Travis.app
+    if Travis.app
+      if Travis.app.store
+        Travis.app.store.destroy()
+      if views = Travis.app.get('_connectedOutletViews')
+        views.forEach (v) -> v.destroy()
+      Travis.app.destroy()
+
   waits(500) # TODO not sure what we need to wait for here
   $('#content').remove()
   $('body').append('<div id="content"></div>')