diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java
index 8f69d72..9b52bdb 100644
--- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java
+++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java
@@ -29,6 +29,8 @@ public class WorkspaceExplorerConstants {
 
 	public static final String WORKSPACE_FOLDER_EMPTY_MESSAGE = "This folder is empty";
 
+	public static final String NO_FOLDER = "No folder";
+
 	// DIALOGS
 	public static final String SAVE = "Save";
 	public static final String MAX_HEIGHT_DIALOG = "500px";
diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java
index 5c481fa..16c7240 100644
--- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java
+++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanel.java
@@ -149,6 +149,7 @@ public class WorkspaceResourcesExplorerPanel extends DockPanel implements HasWor
 			itemsType[2] = ItemType.SHARED_FOLDER;
 			itemsType[3] = ItemType.VRE_FOLDER;
 			initExplorer(folderId, "", itemsType, itemsType, null, null, false, null);
+			wsExplorer.getItTables().setEmptyTableMessage(WorkspaceExplorerConstants.NO_FOLDER);
 		}else{
 			initExplorer(folderId, "", ItemType.values(), ItemType.values(), null, null, false, null);
 		}
@@ -172,6 +173,7 @@ public class WorkspaceResourcesExplorerPanel extends DockPanel implements HasWor
 			itemsType[2] = ItemType.SHARED_FOLDER;
 			itemsType[3] = ItemType.VRE_FOLDER;
 			initExplorer(folderId, "", itemsType, itemsType, showProperties, filter, false, null);
+			wsExplorer.getItTables().setEmptyTableMessage(WorkspaceExplorerConstants.NO_FOLDER);
 		}else{
 			initExplorer(folderId, "", ItemType.values(), ItemType.values(), showProperties, filter, false, null);
 		}
@@ -197,6 +199,7 @@ public class WorkspaceResourcesExplorerPanel extends DockPanel implements HasWor
 			itemsType[2] = ItemType.SHARED_FOLDER;
 			itemsType[3] = ItemType.VRE_FOLDER;
 			initExplorer(folderId, "", itemsType, itemsType, showProperties, filter, showGcubeInfo, sortByColumn);
+			wsExplorer.getItTables().setEmptyTableMessage(WorkspaceExplorerConstants.NO_FOLDER);
 		}else{
 			initExplorer(folderId, "", ItemType.values(), ItemType.values(), showProperties, filter, showGcubeInfo, sortByColumn);
 		}
@@ -224,6 +227,7 @@ public class WorkspaceResourcesExplorerPanel extends DockPanel implements HasWor
 			itemsType[2] = ItemType.SHARED_FOLDER;
 			itemsType[3] = ItemType.VRE_FOLDER;
 			initExplorer(folderId, "", itemsType, itemsType, showProperties, filter, showGcubeInfo, sortByColumn, displayFields);
+			wsExplorer.getItTables().setEmptyTableMessage(WorkspaceExplorerConstants.NO_FOLDER);
 		}else{
 			initExplorer(folderId, "", ItemType.values(), ItemType.values(), showProperties, filter, showGcubeInfo, sortByColumn, displayFields);
 		}
diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java
index e88d18d..a98c388 100644
--- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java
+++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectDialog.java
@@ -41,6 +41,10 @@ import com.google.gwt.user.client.Event;
  */
 public class WorkspaceExplorerSelectDialog extends Modal implements HasWorskpaceExplorerSelectNotificationListener{
 
+	/**
+	 *
+	 */
+
 	private Button selectButton;
 	private WorkspaceExplorerSelectDialog INSTANCE = this;
 	private boolean isSelect = false;
@@ -265,7 +269,7 @@ public class WorkspaceExplorerSelectDialog extends Modal implements HasWorskpace
 	private void customizeEmptyMessage(boolean showOnlyFolders){
 		//AFTER THE INIT I'M CHANGING THE MESSAGE IN CASE OF ONLY FOLDER ARE SHWOWN
 		if(showOnlyFolders)
-			controller.getWsExplorer().getItTables().setEmptyTableMessage("No folder selectable here");
+			controller.getWsExplorer().getItTables().setEmptyTableMessage(WorkspaceExplorerConstants.NO_FOLDER);
 	}
 
 	/**
diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectPanel.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectPanel.java
index 1e55a5d..f10d853 100644
--- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectPanel.java
+++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/select/WorkspaceExplorerSelectPanel.java
@@ -138,6 +138,7 @@ public class WorkspaceExplorerSelectPanel extends ScrollPanel implements HasWors
 			setSelectableTypes(itemsType);
 			setShowableTypes(itemsType);
 		}
+
 		loadExplorer(captionTxt, null);
 		customizeEmptyMessage(showOnlyFolders);
 	}
@@ -169,7 +170,7 @@ public class WorkspaceExplorerSelectPanel extends ScrollPanel implements HasWors
 	private void customizeEmptyMessage(boolean showOnlyFolders){
 		//AFTER THE INIT I'M CHANGING THE MESSAGE IN CASE OF ONLY FOLDER ARE SHWOWN
 		if(showOnlyFolders)
-			controller.getWsExplorer().getItTables().setEmptyTableMessage("No folder selectable here");
+			controller.getWsExplorer().getItTables().setEmptyTableMessage(WorkspaceExplorerConstants.NO_FOLDER);
 	}
 
 	/**
diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/ItemsTable.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/ItemsTable.java
index 222bcbf..d831c90 100644
--- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/ItemsTable.java
+++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/ItemsTable.java
@@ -490,7 +490,7 @@ public class ItemsTable<T extends Item> extends AbstractItemsCellTable<T> implem
 	 * @param msg the new empty table message
 	 */
 	public void setEmptyTableMessage(String msg){
-		msg = msg!=null&&!msg.isEmpty()?msg:WorkspaceExplorerConstants.WORKSPACE_FOLDER_EMPTY_MESSAGE;
+		msg = msg!=null?msg:WorkspaceExplorerConstants.WORKSPACE_FOLDER_EMPTY_MESSAGE;
 		if(sortedCellTable!=null)
 			sortedCellTable.setEmptyTableWidget(new Label(msg));
 	}