diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index aafe1f9fe..866c71945 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -288,11 +288,13 @@ class AtomEnvironment extends Model
   destroy: ->
     return if not @project
 
+    @disposables.dispose()
     @workspace?.destroy()
     @workspace = null
     @themes.workspace = null
     @project?.destroy()
     @project = null
+    @commands.clear()
 
     @uninstallWindowEventHandler()