diff --git a/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
index 9107c141a..991879ba0 100644
--- a/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
+++ b/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
@@ -147,12 +147,12 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
 
   showSiteMap: function() {
     $('#site-map').click();
-    $('#site-map-dropdown').focus();
+    $('#site-map-dropdown a:first').focus();
   },
 
   showCurrentUser: function() {
     $('#current-user').click();
-    $('#user-dropdown').focus();
+    $('#user-dropdown a:first').focus();
   },
 
   showHelpModal: function() {