diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java
index 73dd354..8479a17 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java
@@ -63,6 +63,7 @@ public class ColumnFilterDialog extends Window implements MonitorDialogListener
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("New Filter");
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnFilterDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnFilterDialog.java
index 500b7f4..0757b21 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnFilterDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/MultiColumnFilterDialog.java
@@ -60,6 +60,7 @@ public class MultiColumnFilterDialog extends Window implements MonitorDialogList
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("New Filter");
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java
index 9f9ac7c..3fa5c45 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java
@@ -114,6 +114,7 @@ public class ReplaceColumnByExpressionDialog extends Window implements
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("Replace Column By Expression");
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionDialog.java
index 7abb03d..ac43152 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByMultiColumnExpressionDialog.java
@@ -114,6 +114,7 @@ public class ReplaceColumnByMultiColumnExpressionDialog extends Window implement
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("Replace Column By Expression");
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionDialog.java
index ac9fd84..252a4aa 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionDialog.java
@@ -144,6 +144,7 @@ public class ReplaceExpressionDialog extends Window implements
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("Replace Expression");
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByExpressionDialog.java
index 81f561a..862ae39 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByExpressionDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByExpressionDialog.java
@@ -63,6 +63,7 @@ public class RowsDeleteByExpressionDialog extends Window implements MonitorDialo
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("Delete Rows By Expression");
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByMultiColumnExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByMultiColumnExpressionDialog.java
index 9f6c042..74fea22 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByMultiColumnExpressionDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RowsDeleteByMultiColumnExpressionDialog.java
@@ -60,6 +60,7 @@ public class RowsDeleteByMultiColumnExpressionDialog extends Window implements M
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("Delete Rows By Expression");
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditDialog.java
index b0270f0..c810523 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleEditDialog.java
@@ -46,11 +46,11 @@ public class RuleEditDialog extends Window implements
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("Edit Rule On Column");
 		setClosable(true);
-		setModal(true);
 		forceLayoutOnResize = true;
 		getHeader().setIcon(ExpressionResources.INSTANCE.ruleEdit());
 
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnColumnCreateDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnColumnCreateDialog.java
index ae57ffb..606020c 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnColumnCreateDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnColumnCreateDialog.java
@@ -52,11 +52,11 @@ public class RuleOnColumnCreateDialog extends Window implements
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("New Rule On Column");
 		setClosable(true);
-		setModal(true);
 		forceLayoutOnResize = true;
 		getHeader().setIcon(ExpressionResources.INSTANCE.ruleColumnAdd());
 
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnTableCreateDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnTableCreateDialog.java
index 99d71d6..5f30208 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnTableCreateDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/RuleOnTableCreateDialog.java
@@ -60,11 +60,11 @@ public class RuleOnTableCreateDialog extends Window implements
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("New Rule On Column");
 		setClosable(true);
-		setModal(true);
 		forceLayoutOnResize = true;
 		getHeader().setIcon(ExpressionResources.INSTANCE.ruleTableAdd());
 
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateColumnExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateColumnExpressionDialog.java
index febb428..69a580d 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateColumnExpressionDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateColumnExpressionDialog.java
@@ -82,11 +82,11 @@ public class TemplateColumnExpressionDialog extends Window implements
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("New Rule");
 		setClosable(true);
-		setModal(true);
 		forceLayoutOnResize = true;
 		getHeader().setIcon(ExpressionResources.INSTANCE.ruleColumnAdd());
 
diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateMultiColumnExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateMultiColumnExpressionDialog.java
index 7fd7b4a..30cff29 100644
--- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateMultiColumnExpressionDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/TemplateMultiColumnExpressionDialog.java
@@ -73,11 +73,11 @@ public class TemplateMultiColumnExpressionDialog extends Window implements
 	protected void initWindow() {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
+		setModal(true);
 		setBodyBorder(false);
 		setResizable(false);
 		setHeadingText("New Rule");
 		setClosable(true);
-		setModal(true);
 		forceLayoutOnResize = true;
 		getHeader().setIcon(ExpressionResources.INSTANCE.ruleTableAdd());