diff --git a/files/renderer.php b/files/renderer.php
index 5f9eb61d9bc..f299790c676 100644
--- a/files/renderer.php
+++ b/files/renderer.php
@@ -527,7 +527,7 @@ class core_files_renderer extends plugin_renderer_base {
             <li class="{!}fp-repo"><a href="#"><img class="{!}fp-repo-icon" alt="'. get_string('repositoryicon', 'repository') .'" width="16" height="16" />&nbsp;<span class="{!}fp-repo-name"></span></a></li>
         </ul>
     </div>
-    <div class="fp-repo-items">
+    <div class="fp-repo-items" tabindex="0">
         <div class="fp-navbar">
             <div>
                 <div class="{!}fp-toolbar">
diff --git a/repository/filepicker.js b/repository/filepicker.js
index 95342c43da3..52971f4f357 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -1551,7 +1551,7 @@ M.core_filepicker.init = function(Y, options) {
             }
         },
         display_response: function(id, obj, args) {
-            var scope = args.scope
+            var scope = args.scope;
             // highlight the current repository in repositories list
             scope.fpnode.all('.fp-repo.active').removeClass('active');
             scope.fpnode.all('#fp-repo-'+scope.options.client_id+'-'+obj.repo_id).addClass('active')
@@ -1562,6 +1562,8 @@ M.core_filepicker.init = function(Y, options) {
             if (obj.repo_id && scope.options.repositories[obj.repo_id]) {
                 scope.fpnode.addClass('repository_'+scope.options.repositories[obj.repo_id].type)
             }
+            Y.one('.file-picker .fp-repo-items').focus();
+            
             // display response
             if (obj.login) {
                 scope.viewbar_set_enabled(false);