diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
index 568c4391715..a770d3f4548 100644
--- a/lib/form/filemanager.js
+++ b/lib/form/filemanager.js
@@ -402,6 +402,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 b8e23de0a54..a8d6db61aef 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -791,6 +791,14 @@ M.core_filepicker.init = function(Y, options) {
             } else {
                 this.view_as_icons(appenditems);
             }
+            this.fpnode.one('.fp-content').setAttribute('tabindex', '0');
+            // Temporary fix for IE8 until MDL-41229 is integrated.
+            // The role dialog is needed for screen reader to read
+            // the filepicker's content (MDL-41232).
+            this.fpnode.one('.fp-content').setAttribute('role', 'dialog');
+            this.fpnode.one('.fp-content').setAttribute('aria-live', 'assertive');
+            // End of temporary fix.
+            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')) {