diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/trash/TrashInfoContainer.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/trash/TrashInfoContainer.java
index b712383..4a9af5c 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/trash/TrashInfoContainer.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/trash/TrashInfoContainer.java
@@ -224,7 +224,6 @@ public class TrashInfoContainer extends LayoutContainer {
 
 		//bar.add(buttonRestoreAll);
 
-
 		buttonEmptyTrash = new Button(WorkspaceTrashOperation.EMPTY_TRASH.getLabel(),Resources.getTrashEmpty());
 		buttonEmptyTrash.setToolTip(WorkspaceTrashOperation.EMPTY_TRASH.getOperationDescription());
 		buttonEmptyTrash.setScale(ButtonScale.SMALL);
@@ -362,10 +361,13 @@ public class TrashInfoContainer extends LayoutContainer {
 
 		for (FileTrashedModel fileTrashedModel : trashFiles) {
 			fileTrashedModel.setIcon();
+//			GWT.log("TrashFile: "+fileTrashedModel);
+//			//Workaround remove this
+//			if(fileTrashedModel.isDirectory())
+//				fileTrashedModel.setFolderItemType(GXTFolderItemTypeEnum.FOLDER);
 		}
 
 		store.add(trashFiles);
-
 		activeButtonsOnNotEmtpy(store.getModels().size()>0);
 	}
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c2290dd..f66c9e5 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -30,10 +30,10 @@
 		<servlet-class>org.gcube.portlets.user.workspace.server.DownloadServlet</servlet-class>
 	</servlet>
 
-	<servlet>
-		<servlet-name>DownloadFolderServlet</servlet-name>
-		<servlet-class>org.gcube.portlets.user.workspace.server.DownloadFolderServlet</servlet-class>
-	</servlet>
+<!-- 	<servlet> -->
+<!-- 		<servlet-name>DownloadFolderServlet</servlet-name> -->
+<!-- 		<servlet-class>org.gcube.portlets.user.workspace.server.DownloadFolderServlet</servlet-class> -->
+<!-- 	</servlet> -->
 
 	<!-- Servlets -->
 	<servlet>
@@ -173,10 +173,10 @@
 		<url-pattern>/workspace/DownloadService</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>DownloadFolderServlet</servlet-name>
-		<url-pattern>/workspace/DownloadFolderServlet</url-pattern>
-	</servlet-mapping>
+<!-- 	<servlet-mapping> -->
+<!-- 		<servlet-name>DownloadFolderServlet</servlet-name> -->
+<!-- 		<url-pattern>/workspace/DownloadFolderServlet</url-pattern> -->
+<!-- 	</servlet-mapping> -->
 
 
 	<!-- <servlet-mapping> -->