diff --git a/src/packages/command-panel/lib/command-panel-view.coffee b/src/packages/command-panel/lib/command-panel-view.coffee
index 5a05a999c..949182ab9 100644
--- a/src/packages/command-panel/lib/command-panel-view.coffee
+++ b/src/packages/command-panel/lib/command-panel-view.coffee
@@ -98,9 +98,11 @@ class CommandPanelView extends View
 
   onExpandAll: (event) =>
     @previewList.expandAllPaths()
+    @previewList.focus()
 
   onCollapseAll: (event) =>
-      @previewList.collapseAllPaths()
+    @previewList.collapseAllPaths()
+    @previewList.focus()
 
   attach: (text='', options={}) ->
     @errorMessages.hide()