diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
index 0de38e5..8608273 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
@@ -22,6 +22,7 @@ import org.gcube.portlets.user.workspace.client.event.AddAdministratorEventHandl
 import org.gcube.portlets.user.workspace.client.event.AddFolderEvent;
 import org.gcube.portlets.user.workspace.client.event.AddFolderEventHandler;
 import org.gcube.portlets.user.workspace.client.event.AddSmartFolderEvent;
+import org.gcube.portlets.user.workspace.client.event.CheckItemLockedBySyncEvent;
 import org.gcube.portlets.user.workspace.client.event.CompletedFileUploadEvent;
 import org.gcube.portlets.user.workspace.client.event.DeleteItemEvent;
 import org.gcube.portlets.user.workspace.client.event.DeleteItemEventHandler;
@@ -1540,6 +1541,8 @@ public class AppController implements SubscriberInterface {
 				wsPortlet.getGridGroupContainer().setCurrentFolderView(parent); //SET folder as current view
 				wsPortlet.getGridGroupContainer().unmask();
 				wsPortlet.getGridGroupContainer().updateStore(result);
+
+				AppControllerExplorer.getEventBus().fireEvent(new CheckItemLockedBySyncEvent(folder));
 			}
 		});
 	}
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java
index c693bc9..6b47733 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java
@@ -4,7 +4,6 @@ import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.logical.shared.ResizeEvent;
 import com.google.gwt.event.logical.shared.ResizeHandler;
-import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.RootPanel;
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/DownloadFolderWebSocketServer.java b/src/main/java/org/gcube/portlets/user/workspace/server/DownloadFolderWebSocketServer.java
index 88d7aff..74f0788 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/DownloadFolderWebSocketServer.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/DownloadFolderWebSocketServer.java
@@ -3,10 +3,7 @@ package org.gcube.portlets.user.workspace.server;
 import static org.gcube.common.authorization.client.Constants.authorizationService;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.channels.FileChannel;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;