diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
index 4e8183af920..fa0c62e3e53 100644
--- a/lib/form/filemanager.js
+++ b/lib/form/filemanager.js
@@ -380,6 +380,8 @@ M.form_filemanager.init = function(Y, options) {
                         }
                         e.currentTarget.addClass('checked')
                         this.render();
+                        this.filemanager.one('.fp-content').setAttribute('tabIndex', '0');
+                        this.filemanager.one('.fp-content').focus();
                     }
                 }, this);
         },
diff --git a/repository/filepicker.js b/repository/filepicker.js
index 5ae305ea13c..b13aee502cb 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -794,6 +794,8 @@ M.core_filepicker.init = function(Y, options) {
             } else {
                 this.view_as_icons(appenditems);
             }
+            this.fpnode.one('.fp-content').setAttribute('tabIndex', '0');
+            this.fpnode.one('.fp-content').focus();
             // display/hide the link for requesting next page
             if (!appenditems && this.active_repo.hasmorepages) {
                 if (!this.fpnode.one('.fp-content .fp-nextpage')) {