diff --git a/extra/jheidi/mainToolbarEvents.ajl b/extra/jheidi/mainToolbarEvents.ajl
index 1cfb00a6..f204ff7c 100644
--- a/extra/jheidi/mainToolbarEvents.ajl
+++ b/extra/jheidi/mainToolbarEvents.ajl
@@ -16,25 +16,16 @@ if ("Connect" == who )
 }
 else if ("Refresh" == who)
 {
-  
   DB db = context.get("db");
-   
-  thread("initTree", args(), true);
-  
+
   Panel tab = (Panel)((Tabs)context.get("/mainTabs")).getSelectedComponent();
-  if ( tab.getName() == "Host" )
-  {
-    tab = (Panel)((Tabs)tab.get("tabs")).getSelectedComponent();
-    if ( tab.getName() != "Processes")
-    {
-      db.flushCache();
-    }
-  }
-  else
+  if ( tab.getName() != "Host" )
   {
     db.flushCache();
   }
-    
+
+  thread("initTree", args(), true);
+  
   String script = tab.getProperty("refreshScript");
   HashObject scriptArgs = (HashObject)tab.getProperty("refreshArgs");
   if ( script != null )
diff --git a/extra/jheidi/mainWindowEvents.ajl b/extra/jheidi/mainWindowEvents.ajl
index 2e5b6dd4..677579a0 100644
--- a/extra/jheidi/mainWindowEvents.ajl
+++ b/extra/jheidi/mainWindowEvents.ajl
@@ -19,22 +19,14 @@ else if ("Connection" == who)
 else if ("Refresh" == who)
 {
   DB db = context.get("db");
-   
-  thread("initTree", args(), true);
-  
+
   Panel tab = (Panel)((Tabs)context.get("/mainTabs")).getSelectedComponent();
-  if ( tab.getName() == "Host" )
-  {
-    tab = (Panel)((Tabs)tab.get("tabs")).getSelectedComponent();
-    if ( tab.getName() != "Processes")
-    {
-      db.flushCache();
-    }
-  }
-  else
+  if ( tab.getName() != "Host" )
   {
     db.flushCache();
   }
+
+  thread("initTree", args(), true);
     
   String script = tab.getProperty("refreshScript");
   HashObject scriptArgs = (HashObject)tab.getProperty("refreshArgs");