diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
index e358b5d287f..5ce6a6a91d5 100644
--- a/lib/form/filemanager.js
+++ b/lib/form/filemanager.js
@@ -29,7 +29,7 @@
  * this.areamaxbytes, the maximum size of the area
  * this.filemanager, contains reference to filemanager Node
  * this.selectnode, contains referenct to select-file Node
- * this.selectui, YUI Panel to select the file
+ * this.selectui, M.core.dialogue to select the file
  *
  * FileManager options:
  * =====
@@ -109,16 +109,14 @@ M.form_filemanager.init = function(Y, options) {
             this.selectnode.generateID();
 
             var labelid = 'fm-dialog-label_'+ this.selectnode.get('id');
-            this.selectui = new Y.Panel({
+            this.selectui = new M.core.dialogue({
+                draggable    : true,
                 headerContent: '<span id="' + labelid +'">' + M.str.moodle.edit + '</span>',
                 srcNode      : this.selectnode,
-                zIndex       : 7600,
                 centered     : true,
                 modal        : true,
-                close        : true,
-                render       : true
+                visible      : false,
             });
-            this.selectui.plug(Y.Plugin.Drag,{handles:['#'+this.selectnode.get('id')+' .yui3-widget-hd']});
             Y.one('#'+this.selectnode.get('id')).setAttribute('aria-labelledby', labelid);
             this.selectui.hide();
             this.setup_select_file();
@@ -243,15 +241,13 @@ M.form_filemanager.init = function(Y, options) {
                 this.msg_dlg_node = Y.Node.createWithFilesSkin(M.form_filemanager.templates.message);
                 var nodeid = this.msg_dlg_node.generateID();
 
-                this.msg_dlg = new Y.Panel({
+                this.msg_dlg = new M.core.dialogue({
+                    draggable    : true,
                     srcNode      : this.msg_dlg_node,
-                    zIndex       : 8000,
                     centered     : true,
                     modal        : true,
                     visible      : false,
-                    render       : true
                 });
-                this.msg_dlg.plug(Y.Plugin.Drag,{handles:['#'+nodeid+' .yui3-widget-hd']});
                 this.msg_dlg_node.one('.fp-msg-butok').on('click', function(e) {
                     e.preventDefault();
                     this.msg_dlg.hide();
@@ -323,15 +319,13 @@ M.form_filemanager.init = function(Y, options) {
                     };
                     if (!this.mkdir_dialog) {
                         var node = Y.Node.createWithFilesSkin(M.form_filemanager.templates.mkdir);
-                        this.mkdir_dialog = new Y.Panel({
+                        this.mkdir_dialog = new M.core.dialogue({
+                            draggable    : true,
                             srcNode      : node,
-                            zIndex       : 8000,
                             centered     : true,
                             modal        : true,
                             visible      : false,
-                            render       : true
                         });
-                        this.mkdir_dialog.plug(Y.Plugin.Drag,{handles:['.yui3-widget-hd']});
                         node.one('.fp-dlg-butcreate').set('id', 'fm-mkdir-butcreate-'+this.client_id).on('click',
                                 perform_action, this);
                         node.one('input').set('id', 'fm-newname-'+this.client_id).on('keydown', function(e) {
@@ -741,16 +735,14 @@ M.form_filemanager.init = function(Y, options) {
                 this.confirm_dlg_node = Y.Node.createWithFilesSkin(M.form_filemanager.templates.confirmdialog);
                 var node = this.confirm_dlg_node;
                 node.generateID();
-                this.confirm_dlg = new Y.Panel({
+                this.confirm_dlg = new M.core.dialogue({
+                    draggable    : true,
                     srcNode      : node,
-                    zIndex       : 8000,
                     centered     : true,
                     modal        : true,
                     visible      : false,
-                    render       : true,
                     buttons      : {}
                 });
-                this.confirm_dlg.plug(Y.Plugin.Drag,{handles:['#'+node.get('id')+' .yui3-widget-hd']});
                 var handle_confirm = function(ev) {
                     var dlgopt = this.confirm_dlg.dlgopt;
                     ev.preventDefault();