diff --git a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java
index 46d97cd..4b32b12 100644
--- a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java
@@ -149,7 +149,9 @@ public class ToolBoxPanel extends ContentPanel {
 	}
 	
 	protected void doHistoryTab(){
-		if (uiStateType == UIStateType.TR_OPEN) {
+		if (uiStateType == UIStateType.TR_OPEN
+				|| uiStateType == UIStateType.TABLECURATION
+				|| uiStateType == UIStateType.TABLEUPDATE) {
 			if (state == ToolBoxPanelState.OPENED) {
 				toolBox.openHistoryTab();
 				Log.debug("ToolBoxPanelSTate.OPENED Add Tabs");
@@ -166,7 +168,9 @@ public class ToolBoxPanel extends ContentPanel {
 	
 	protected void doColumnTypeChangeTab(WidgetRequestEvent event){
 		Log.debug("WidgetRequestEvent.CHANGECOLUMNTYPEPANEL : ["+event.getTrId()+" ,columnName: "+event.getColumnName()+"]");
-		if (uiStateType == UIStateType.TR_OPEN) {
+		if (uiStateType == UIStateType.TR_OPEN
+				|| uiStateType == UIStateType.TABLECURATION
+				|| uiStateType == UIStateType.TABLEUPDATE) {
 			if (state == ToolBoxPanelState.OPENED) {
 				toolBox.openColumnTypeChangeTab(event.getTrId(), event.getColumnName());
 				Log.debug("ToolBoxPanelSTate.OPENED Add Tabs");
@@ -183,7 +187,9 @@ public class ToolBoxPanel extends ContentPanel {
 	
 	protected void doDeleteColumnTab(WidgetRequestEvent event){
 		Log.debug("WidgetRequestEvent.DeleteColumnPanel : ["+event.getTrId()+" ,columnName: "+event.getColumnName()+"]");
-		if (uiStateType == UIStateType.TR_OPEN) {
+		if (uiStateType == UIStateType.TR_OPEN
+				|| uiStateType == UIStateType.TABLECURATION
+				|| uiStateType == UIStateType.TABLEUPDATE) {
 			if (state == ToolBoxPanelState.OPENED) {
 				toolBox.openDeleteColumnTab(event.getTrId(), event.getColumnName());
 				Log.debug("ToolBoxPanelSTate.OPENED Add Tabs");
@@ -200,7 +206,9 @@ public class ToolBoxPanel extends ContentPanel {
 	
 	protected void doLabelColumnTab(WidgetRequestEvent event){
 		Log.debug("WidgetRequestEvent.LabelColumnPanel : ["+event.getTrId()+" ,columnName: "+event.getColumnName()+"]");
-		if (uiStateType == UIStateType.TR_OPEN) {
+		if (uiStateType == UIStateType.TR_OPEN
+				|| uiStateType == UIStateType.TABLECURATION
+				|| uiStateType == UIStateType.TABLEUPDATE) {
 			if (state == ToolBoxPanelState.OPENED) {
 				toolBox.openLabelColumnTab(event.getTrId(), event.getColumnName());
 				Log.debug("ToolBoxPanelSTate.OPENED Add Tabs");
@@ -218,7 +226,9 @@ public class ToolBoxPanel extends ContentPanel {
 	
 	protected void doChangeTableTypeTab(WidgetRequestEvent event){
 		Log.debug("WidgetRequestEvent.ChangeTableTypePanel : ["+event.getTrId()+"]");
-		if (uiStateType == UIStateType.TR_OPEN) {
+		if (uiStateType == UIStateType.TR_OPEN
+				|| uiStateType == UIStateType.TABLECURATION
+				|| uiStateType == UIStateType.TABLEUPDATE) {
 			if (state == ToolBoxPanelState.OPENED) {
 				toolBox.openChangeTableTypeTab(event.getTrId());
 				Log.debug("ToolBoxPanelSTate.OPENED Add Tabs");
@@ -236,7 +246,9 @@ public class ToolBoxPanel extends ContentPanel {
 	
 	protected void doDuplicatesRowsTab(WidgetRequestEvent event){
 		Log.debug("WidgetRequestEvent.DuplicateRowsPanel : ["+event.getTrId()+"]");
-		if (uiStateType == UIStateType.TR_OPEN) {
+		if (uiStateType == UIStateType.TR_OPEN
+				|| uiStateType == UIStateType.TABLECURATION
+				|| uiStateType == UIStateType.TABLEUPDATE) {
 			if (state == ToolBoxPanelState.OPENED) {
 				toolBox.openDuplicatesRowsTab(event.getTrId());
 				Log.debug("ToolBoxPanelSTate.OPENED Add Tabs");
@@ -253,7 +265,9 @@ public class ToolBoxPanel extends ContentPanel {
 	
 	protected void doValidationsTableTab(WidgetRequestEvent event){
 		Log.debug("WidgetRequestEvent.ValidationsTablePanel : ["+event.getTrId()+"]");
-		if (uiStateType == UIStateType.TR_OPEN) {
+		if (uiStateType == UIStateType.TR_OPEN
+				|| uiStateType == UIStateType.TABLECURATION
+				|| uiStateType == UIStateType.TABLEUPDATE) {
 			if (state == ToolBoxPanelState.OPENED) {
 				toolBox.openValidationsTableTab(event.getTrId());
 				Log.debug("ToolBoxPanelSTate.OPENED Add Tabs");
@@ -271,7 +285,9 @@ public class ToolBoxPanel extends ContentPanel {
 	
 	
 	protected void doPropertiesOpenTab(){
-		if (uiStateType == UIStateType.TR_OPEN) {
+		if (uiStateType == UIStateType.TR_OPEN
+				|| uiStateType == UIStateType.TABLECURATION
+				|| uiStateType == UIStateType.TABLEUPDATE) {
 			if (state == ToolBoxPanelState.OPENED) {
 				toolBox.openPropertiesTab();
 				Log.debug("ToolBoxPanelSTate.OPENED Add Tabs");