diff --git a/lib/client/dom.js b/lib/client/dom.js
index 7423c544..3f316036 100644
--- a/lib/client/dom.js
+++ b/lib/client/dom.js
@@ -1633,17 +1633,18 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
                                 var panel           = DOM.getPanel(),
                                     panelPassive    = DOM.getPanel({active: false}),
                                     setCurrent      = function() {
-                                        var current = DOM.getCurrentByName(name);
+                                        var current;
+                                        
+                                        if (!name)
+                                            name = data.names[0];
+                                        
+                                        current = DOM.getCurrentByName(name);
                                         DOM.setCurrentFile(current);
                                     };
                                 
-                                if (!data) {
-                                    CloudCmd.refresh(panel);
-                                    CloudCmd.refresh(panelPassive, setCurrent);
-                                } else {
-                                    CloudCmd.refresh(panelPassive);
+                                CloudCmd.refresh(panelPassive, function() {
                                     CloudCmd.refresh(panel, setCurrent);
-                                }
+                                });
                             });
                         });
                     }
@@ -1656,7 +1657,6 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
                 }, data);
             };
             
-            
             this.moveFiles      = function(data) {
                 processFiles({
                     move: true