diff --git a/src/extensions/command-panel/spec/command-panel-spec.coffee b/src/extensions/command-panel/spec/command-panel-spec.coffee
index 6617a8b07..d9618eef2 100644
--- a/src/extensions/command-panel/spec/command-panel-spec.coffee
+++ b/src/extensions/command-panel/spec/command-panel-spec.coffee
@@ -79,9 +79,16 @@ describe "CommandPanel", ->
       rootView2.deactivate()
 
   describe "when core:close is triggered on the command panel", ->
-    it "detaches the command panel", ->
+    it "detaches the command panel, focuses the RootView and does not bubble the core:close event", ->
       commandPanel.attach()
+      rootViewCloseHandler = jasmine.createSpy('rootViewCloseHandler')
+      rootView.on 'core:close', rootViewCloseHandler
+      spyOn(rootView, 'focus')
+
       commandPanel.trigger('core:close')
+
+      expect(rootView.focus).toHaveBeenCalled()
+      expect(rootViewCloseHandler).not.toHaveBeenCalled()
       expect(commandPanel.hasParent()).toBeFalsy()
 
   describe "when command-panel:toggle is triggered on the root view", ->
diff --git a/src/extensions/command-panel/src/command-panel.coffee b/src/extensions/command-panel/src/command-panel.coffee
index c15f061f1..db04383d0 100644
--- a/src/extensions/command-panel/src/command-panel.coffee
+++ b/src/extensions/command-panel/src/command-panel.coffee
@@ -51,7 +51,7 @@ class CommandPanel extends View
     @historyIndex = @history.length
 
     @command 'tool-pane:unfocus', => @rootView.focus()
-    @command 'core:close', => @detach()
+    @command 'core:close', => @detach(); false
     @command 'core:confirm', => @execute()
 
     @rootView.command 'command-panel:toggle', => @toggle()