diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java b/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java
index f018c46..4baf2ef 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java
@@ -296,7 +296,10 @@ public class DownloadServlet extends HttpServlet{
 
 							String itemName = MimeTypeUtil.getNameWithExtension(descr.getItemName(), workspaceFileItem.getMimeType());
 							logger.info("Downloading default item: "+workspaceFileItem);
-							String contentDisposition = viewContent?"inline":"attachment";
+							//String contentDisposition = viewContent?"inline":"attachment";
+							//Support #16430 
+							//The 'inline' option may be badly managed by browser, so I'm forcing the 'attachment' option
+							String contentDisposition = "attachment";
 							resp.setHeader("Content-Disposition", contentDisposition+"; filename=\"" + itemName + "\"" );
 							if(workspaceFileItem.getSize()!=null && workspaceFileItem.getSize()>0)
 								resp = setContentLength(resp, workspaceFileItem.getSize());