diff --git a/assets/javascripts/views/sidebar/doc_picker.coffee b/assets/javascripts/views/sidebar/doc_picker.coffee
index 9ce3c49e..689b67b2 100644
--- a/assets/javascripts/views/sidebar/doc_picker.coffee
+++ b/assets/javascripts/views/sidebar/doc_picker.coffee
@@ -13,13 +13,16 @@ class app.views.DocPicker extends app.View
   activate: ->
     if super
       @render()
+      @findByTag('input').focus()
       app.appCache?.on 'progress', @onAppCacheProgress
+      $.on @el, 'focus', @onFocus, true
     return
 
   deactivate: ->
     if super
       @empty()
       app.appCache?.off 'progress', @onAppCacheProgress
+      $.off @el, 'focus', @onFocus, true
     return
 
   render: ->
@@ -58,6 +61,9 @@ class app.views.DocPicker extends app.View
       @save()
     return
 
+  onFocus: (event) ->
+    $.scrollTo event.target.parentNode, null, 'continuous', bottomGap: 2
+
   onEnter: =>
     @save()
     return
diff --git a/assets/stylesheets/components/_sidebar.scss b/assets/stylesheets/components/_sidebar.scss
index 646a8ee4..0b5c7aa4 100644
--- a/assets/stylesheets/components/_sidebar.scss
+++ b/assets/stylesheets/components/_sidebar.scss
@@ -268,6 +268,7 @@
 }
 
 ._list-label {
+  cursor: pointer;
   transition: .2s;
   @extend %_list-dir;