diff --git a/workflow/engine/methods/setup/main.php b/workflow/engine/methods/setup/main.php
index 4895d61f6..b0b213874 100755
--- a/workflow/engine/methods/setup/main.php
+++ b/workflow/engine/methods/setup/main.php
@@ -35,6 +35,13 @@ else {
   unset($_SESSION['DEV_FLAG']);
   unset($_SESSION['TOOLS_VIEWTYPE']);
 }
+
+if( isset($_GET['s']) )
+  $_SESSION['ADMIN_SELECTED'] = $_GET['s'];
+else {
+  unset($_SESSION['ADMIN_SELECTED']);
+}
+
 $G_PUBLISH->AddContent('view', 'setup/main_Load');
 G::RenderPage('publish');
 
diff --git a/workflow/engine/methods/setup/main_init.php b/workflow/engine/methods/setup/main_init.php
index 5f3b61f24..1e6ad9100 100755
--- a/workflow/engine/methods/setup/main_init.php
+++ b/workflow/engine/methods/setup/main_init.php
@@ -56,9 +56,10 @@
     $i++;
   }
 
-  $oHeadPublisher->addExtJsScript('setup/main', false);    //adding a javascript file .js
+  $oHeadPublisher->addExtJsScript('setup/main', true);    //adding a javascript file .js
   $oHeadPublisher->addContent('setup/main'); //adding a html file  .html.
   $oHeadPublisher->assign('tabItems', $tabItems);
+  $oHeadPublisher->assign('_item_selected', (isset($_SESSION['ADMIN_SELECTED'])?$_SESSION['ADMIN_SELECTED']:''));
 
   G::RenderPage('publish', 'extJs');
   // this patch enables the load of the plugin list panel inside de main admin panel iframe
diff --git a/workflow/engine/templates/setup/main.js b/workflow/engine/templates/setup/main.js
index dd019c064..82f04a9b6 100755
--- a/workflow/engine/templates/setup/main.js
+++ b/workflow/engine/templates/setup/main.js
@@ -3,11 +3,13 @@
  * Aug 20th, 2010 
  */
 
+var _NODE_SELECTED;
 var main = function(){
   Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
   
-  items = Array();
-  
+  var items = Array();
+  var i;
+ 
   for(i=0; i<tabItems.length; i++){
     
     items[i] = new Ext.tree.TreePanel({
@@ -31,8 +33,23 @@ var main = function(){
       listeners: {
         'click': function(tp) {
           if( tp.attributes.url ){
+            _NODE_SELECTED = tp.id;
             document.getElementById('setup-frame').src = tp.attributes.url;
           }
+        },
+        'render': function(tp){
+        	
+          var loader = tp.getLoader();
+	    	loader.on("load", function(){
+	        if( _item_selected != '' ){
+	          node = tp.getNodeById(_item_selected);
+	    	  document.getElementById('setup-frame').src = node.attributes.url;
+	    	  if(node){
+	    	    node.select();
+	    	    _NODE_SELECTED = node.attributes.id;
+	    	  }
+	    	}
+	      });
         }
       }
     });
diff --git a/workflow/engine/templates/setup/pluginsMain.js b/workflow/engine/templates/setup/pluginsMain.js
index 5b8f4ade9..89ff03e08 100755
--- a/workflow/engine/templates/setup/pluginsMain.js
+++ b/workflow/engine/templates/setup/pluginsMain.js
@@ -251,6 +251,10 @@ function activeDeactive(){
       method: 'GET',
       success: function ( result, request ) {
         //Ext.MessageBox.alert('Success', 'Data return from the server: '+ result.responseText);
+    	  
+    	parent.parent.location.href = 'main?s='+parent._NODE_SELECTED;
+    	return;
+    	  
         store.reload();
 
         plugins = parent.Ext.getCmp('plugins');