diff --git a/src/packages/command-panel/lib/path-view.coffee b/src/packages/command-panel/lib/path-view.coffee
index 4e0fddae9..b9022b6e9 100644
--- a/src/packages/command-panel/lib/path-view.coffee
+++ b/src/packages/command-panel/lib/path-view.coffee
@@ -9,8 +9,9 @@ class PathView extends View
     classes = ['path']
     classes.push('readme') if fs.isReadmePath(path)
     @li class: classes.join(' '), =>
-      @span class: 'path-name', path
-      @span "(#{operations.length})", class: 'path-match-number'
+      @div class: 'path-details', =>
+        @span class: 'path-name', path
+        @span "(#{operations.length})", class: 'path-match-number'
       @ul outlet: 'matches', class: 'matches', =>
         for operation in operations
           @subview "operation#{operation.index}", new OperationView({operation, previewList})
diff --git a/static/command-panel.css b/static/command-panel.css
index 75b7bfbe8..9bc024fee 100644
--- a/static/command-panel.css
+++ b/static/command-panel.css
@@ -50,7 +50,7 @@
   -webkit-user-select: none;
 }
 
-.command-panel .preview-list .path:before {
+.command-panel .preview-list .path-details:before {
   font-family: 'Octicons Regular';
   font-size: 12px;
   width: 12px;
@@ -62,7 +62,7 @@
   top: 0;
 }
 
-.command-panel .preview-list .path.is-collapsed:before {
+.command-panel .preview-list .is-collapsed .path-details:before {
   content: "\f05a";
 }
 
diff --git a/themes/atom-dark-ui/command-panel.css b/themes/atom-dark-ui/command-panel.css
index 8e25aed1d..0014608b7 100644
--- a/themes/atom-dark-ui/command-panel.css
+++ b/themes/atom-dark-ui/command-panel.css
@@ -51,11 +51,13 @@
   color: #fff;
 }
 
-.command-panel .preview-list li.selected {
+.command-panel .preview-list .path.selected .path-details,
+.command-panel .preview-list li.operation.selected {
   background-color: rgba(255, 255, 255, 0.05);
 }
 
-.command-panel .preview-list:focus li.selected {
+.command-panel .preview-list:focus .path.selected .path-details,
+.command-panel .preview-list:focus li.operation.selected {
   background-color: rgba(255, 255, 255, 0.05);
 }