diff --git a/gulliver/js/ext/ux.locationbar/Ext.ux.LocationBar.js b/gulliver/js/ext/ux.locationbar/Ext.ux.LocationBar.js
index 2cfd71b56..487ae992c 100755
--- a/gulliver/js/ext/ux.locationbar/Ext.ux.LocationBar.js
+++ b/gulliver/js/ext/ux.locationbar/Ext.ux.LocationBar.js
@@ -116,6 +116,7 @@ Ext.ux.LocationBar = Ext.extend(Ext.Toolbar, {
                 if (node.isLeaf()==false && node.childNodes.length==0){
                     //console.log(node.isLeaf(),node.childNodes.length)
                     this.nodeJustLoaded=node;
+                    this.setNode(node);
                     //this.tree.getLoader().load(node);
                     //this.loadNode(node);
                 }else{
diff --git a/workflow/engine/templates/cases/casesDocuments.js b/workflow/engine/templates/cases/casesDocuments.js
index ea1883e49..06b895d87 100755
--- a/workflow/engine/templates/cases/casesDocuments.js
+++ b/workflow/engine/templates/cases/casesDocuments.js
@@ -509,16 +509,23 @@ function handleCallback(requestParams, node) {
         if( json.success ) {
           if( json.success == "success"){
             statusBarMessage( json.message, false, true );
+            if (options.params.action == 'rename') {
+              node = dirTree.getSelectionModel().getSelectedNode();  
+            }
             try {
-              if( dropEvent) {
+              if( typeof(dropEvent) != 'undefined' ) {
                 dropEvent.target.parentNode.reload();
                 dropEvent = null;
               }
-              if( node ) {
-                if( options.params.action == 'delete' || options.params.action == 'rename' ) {
+              if( typeof(node) != 'undefined' ) {
+                if( options.params.action == 'delete' ) {
                   node.parentNode.select();
+                  node.parentNode.reload();
+                }
+                if( options.params.action == 'rename' ) {
+                  node.reload();
+                  node.select();
                 }
-                node.parentNode.reload();
               } else {
                 datastore.reload();
               }