diff --git a/client/buffer.js b/client/buffer.js
index fe4d73ad..6ef4ed6a 100644
--- a/client/buffer.js
+++ b/client/buffer.js
@@ -6,8 +6,8 @@ const jonny = require('jonny');
 const exec = require('execon');
 
 const Storage = require('./storage');
-const Dialog = require('./dialog');
 const DOM = require('./dom');
+const {Dialog} = DOM;
 
 module.exports = new BufferProto(DOM, CloudCmd);
 
diff --git a/client/client.js b/client/client.js
index 924ce26a..4050bac6 100644
--- a/client/client.js
+++ b/client/client.js
@@ -199,12 +199,6 @@ function CloudCmdProto(Util, DOM, CloudFunc) {
         if (config.onePanelMode)
             CloudCmd.MIN_ONE_PANEL_WIDTH = Infinity;
         
-        const {htmlDialogs} = config;
-        
-        DOM.Dialog = DOM.Dialog(prefix, {
-            htmlDialogs
-        });
-        
         Util.exec.if(document.body.scrollIntoViewIfNeeded, func, funcBefore);
     };
     
diff --git a/client/cloudcmd.js b/client/cloudcmd.js
index 9de37a16..58cf317c 100644
--- a/client/cloudcmd.js
+++ b/client/cloudcmd.js
@@ -10,6 +10,16 @@ window.CloudCmd = (config) => {
     window.Util = require('../common/util');
     window.CloudFunc = require('../common/cloudfunc');
     window.DOM = require('./dom');
+    
+    const Dialog = require('./dialog');
+    
+    const prefix = getPrefix(config.prefix);
+    const {htmlDialogs} = config;
+    
+    DOM.Dialog = Dialog(prefix, {
+        htmlDialogs
+    });
+    
     window.CloudCmd = require('./client');
     
     require('./listeners');
@@ -31,7 +41,6 @@ window.CloudCmd = (config) => {
         .map((name) => `${name}.js`);
     
     const urlFiles = getJoinURL(allFiles);
-    const prefix = getPrefix(config.prefix);
     
     createScript(prefix + urlFiles, () => {
         window.CloudCmd.init(prefix, config);
diff --git a/client/dom.js b/client/dom.js
index e9c773d7..8fdb0857 100644
--- a/client/dom.js
+++ b/client/dom.js
@@ -24,7 +24,6 @@ module.exports = DOM;
 
 DOM.uploadDirectory = require('./directory');
 DOM.Buffer = require('./buffer');
-DOM.Dialog = require('./dialog');
 DOM.Events = require('./events');
 DOM.Storage = require('./storage');
 DOM.Files = require('./files');
diff --git a/client/rest.js b/client/rest.js
index b9f0a5a8..8f87b82c 100644
--- a/client/rest.js
+++ b/client/rest.js
@@ -2,13 +2,12 @@
 
 const itype = require('itype/legacy');
 
-/* global CloudFunc, CloudCmd */
+/* global CloudFunc, CloudCmd, DOM */
 
 module.exports = new RESTful();
 
 const {Images} = require('./dom');
 const load = require('./load');
-const Dialog = require('./dialog');
 
 function RESTful() {
     this.delete = (url, data, callback) => {
@@ -184,20 +183,20 @@ function RESTful() {
             url         : p.url,
             data        : p.data,
             dataType    : p.dataType,
-            error       : function(jqXHR) {
-                var response       = jqXHR.responseText,
-                    statusText     = jqXHR.statusText,
-                    status         = jqXHR.status,
-                    text           = status === 404 ? response : statusText;
+            error       : (jqXHR) => {
+                const response = jqXHR.responseText;
+                const statusText = jqXHR.statusText;
+                const status = jqXHR.status;
+                const text = status === 404 ? response : statusText;
                 
                 Images.show.error(text);
-                setTimeout(function() {
-                    Dialog.alert(CloudCmd.TITLE, text);
+                setTimeout(() => {
+                    DOM.Dialog.alert(CloudCmd.TITLE, text);
                 }, 100);
                 
                 p.callback(Error(text));
             },
-            success     : function(data) {
+            success: (data) => {
                 Images.hide();
                 
                 if (!p.notLog)