diff --git a/lib/client.js b/lib/client.js
index 38e8b132..eae5c124 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -203,9 +203,10 @@ var Util, DOM, CloudFunc;
                     showLoad    = Images.showLoad.bind(Images),
                     
                     doBefore    = {
-                        'edit'  : showLoad,
-                        'view'  : showLoad,
-                        'menu'  : showLoad
+                        'edit'                  : showLoad,
+                        'view'                  : showLoad,
+                        'menu'                  : showLoad,
+                        'storage/_filepicker'   : showLoad
                     },
                     
                     load = function(name, path, func) {
@@ -234,7 +235,7 @@ var Util, DOM, CloudFunc;
                     name = mod[i],
                     path = STORAGE + '/_' + name.toLowerCase();
                     
-                    load(name, path);
+                    load(name, path, doBefore[path]);
                 }
                 
                 Util.exec(callback);