diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index e65742d0f..86608e1b3 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -144,13 +144,15 @@ define([
     };
 
     dialog.frame = function (content) {
-        return h('div.alertify', {
+        return $(h('div.alertify', {
             tabindex: 1,
         }, [
             h('div.dialog', [
                 h('div', content),
             ])
-        ]);
+        ])).click(function (e) {
+            e.stopPropagation();
+        })[0];
     };
 
     /**
diff --git a/www/filepicker/app-filepicker.less b/www/filepicker/app-filepicker.less
index 952a4d857..5a80661cf 100644
--- a/www/filepicker/app-filepicker.less
+++ b/www/filepicker/app-filepicker.less
@@ -4,11 +4,15 @@
 @import (once) '../../customize/src/less2/include/fileupload.less';
 @import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/tippy.less';
+@import (once) '../../customize/src/less2/include/checkmark.less';
+@import (once) '../../customize/src/less2/include/password-input.less';
 
 .iconColors_main();
 .fileupload_main();
 .alertify_main();
 .tippy_main();
+.checkmark_main(20px);
+.password_main();
 
 #cp-filepicker-dialog {
     display: none;