diff --git a/binaries/jars/latest_development/intrace-agent.jar b/binaries/jars/latest_development/intrace-agent.jar
index 5a1124e..c6740b8 100644
Binary files a/binaries/jars/latest_development/intrace-agent.jar and b/binaries/jars/latest_development/intrace-agent.jar differ
diff --git a/binaries/jars/latest_development/intrace-ui.jar b/binaries/jars/latest_development/intrace-ui.jar
index c29bbe1..eacdf1b 100644
Binary files a/binaries/jars/latest_development/intrace-ui.jar and b/binaries/jars/latest_development/intrace-ui.jar differ
diff --git a/intrace.ecl.plugin/lib/intrace-agent.jar b/intrace.ecl.plugin/lib/intrace-agent.jar
index 5a1124e..c6740b8 100644
Binary files a/intrace.ecl.plugin/lib/intrace-agent.jar and b/intrace.ecl.plugin/lib/intrace-agent.jar differ
diff --git a/intrace.ecl.plugin/lib/intrace-ui-helper.jar b/intrace.ecl.plugin/lib/intrace-ui-helper.jar
index e126200..b79be42 100644
Binary files a/intrace.ecl.plugin/lib/intrace-ui-helper.jar and b/intrace.ecl.plugin/lib/intrace-ui-helper.jar differ
diff --git a/org.intrace/lib/intrace-agent.jar b/org.intrace/lib/intrace-agent.jar
index 5a1124e..c6740b8 100644
Binary files a/org.intrace/lib/intrace-agent.jar and b/org.intrace/lib/intrace-agent.jar differ
diff --git a/org.intrace/src/org/intrace/client/gui/helper/InTraceUI.java b/org.intrace/src/org/intrace/client/gui/helper/InTraceUI.java
index 81ed42c..f5c9143 100644
--- a/org.intrace/src/org/intrace/client/gui/helper/InTraceUI.java
+++ b/org.intrace/src/org/intrace/client/gui/helper/InTraceUI.java
@@ -145,7 +145,7 @@ public class InTraceUI implements ISocketCallback, IControlConnectionListener
     outputTabs.composite.setLayoutData("grow,wmin 0,hmin 0");
     
     updateUIStateSameThread();
-    
+        
     sWindow.getDisplay().addFilter(SWT.KeyDown, new Listener()
     {
       @Override
@@ -545,7 +545,11 @@ public class InTraceUI implements ISocketCallback, IControlConnectionListener
     private void hide()
     {
       composite.setVisible(false);
-      sRoot.layout();
+      if (mode == UIMode.ECLIPSE)
+      {
+        sRoot.pack();
+      }
+      sRoot.layout(true, true);
     }
   }
 
@@ -622,6 +626,8 @@ public class InTraceUI implements ISocketCallback, IControlConnectionListener
     {
       composite.setVisible(false);
       sRoot.layout();
+      
+      
     }
 
     private class TraceTab