diff --git a/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java b/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java
index 9b49367..1dc121c 100644
--- a/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java
+++ b/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java
@@ -68,6 +68,8 @@ public class WizardWindow extends Window {
 	protected ArrayList<WizardListener> listeners;
 
 	protected EventBus eventBus;
+	
+	protected ToolBar toolbar;
 
 	/**
 	 * Create a new Wizard Window with the specified title.
@@ -100,7 +102,7 @@ public class WizardWindow extends Window {
 		cardContainer = new CardLayoutContainer();
 		container.add(cardContainer, new VerticalLayoutData(1, 1));
 
-		ToolBar toolbar = new ToolBar();
+		toolbar = new ToolBar();
 		toolbar.setSpacing(2);
 		toolbar.addStyleName(ThemeStyles.getStyle().borderTop());
 
@@ -286,6 +288,7 @@ public class WizardWindow extends Window {
 				close(false);
 			}
 		};
+		toolbar.forceLayout();
 		forceLayout();
 	}