diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
index 7a9a6209c67..0f9ce8989cc 100644
--- a/lib/form/filemanager.js
+++ b/lib/form/filemanager.js
@@ -436,6 +436,7 @@ M.form_filemanager.init = function(Y, options) {
             // XXX: magic here, to let filepicker use filemanager scope
             options.magicscope = this;
             options.savepath = this.currentpath;
+            options.previousActiveElement = e.target.ancestor('a', true);
             M.core_filepicker.show(Y, options);
         },
 
diff --git a/repository/filepicker.js b/repository/filepicker.js
index 79ba49db4fc..22940d58127 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -1357,7 +1357,9 @@ M.core_filepicker.init = function(Y, options) {
                 width        : width+'px',
                 responsiveWidth : 768,
                 height       : '558px',
-                zIndex       : this.options.zIndex
+                zIndex       : this.options.zIndex,
+                focusOnPreviousTargetAfterHide: true,
+                focusAfterHide: this.options.previousActiveElement
             });
 
             // create panel for selecting a file (initially hidden)