diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java
index 44ca17d570..e4c32ec393 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java
@@ -52,7 +52,7 @@ import org.zkoss.zul.Space;
  * @author Cristina Ghita, www.arhipac.ro
  * 				<li>FR [ 2076330 ] Add new methods in CWindowToolbar class
  */
-public class CWindowToolbar extends FToolbar implements EventListener
+public class CWindowToolbar extends FToolbar implements EventListener<Event>
 {
 	private static final String BTNPREFIX = "Btn";
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java
index 6de955f142..af42e42639 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java
@@ -208,6 +208,7 @@ public class ADWindowPanel extends AbstractADWindowPanel
 						}
 					}
 				}
+				getComponent().getParent().invalidate();
 			}
 		});
         
@@ -276,6 +277,8 @@ public class ADWindowPanel extends AbstractADWindowPanel
 							break;
 						}
 					}
+				} else {
+					tabbox.getSelectedPanel().invalidate();
 				}
 				tabPanel.detach();
 				tab.detach();