diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java
index 693bd79..ff4a5a7 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java
@@ -63,14 +63,12 @@ public class DialogEditProperties extends Dialog{
 		setScrollMode(Scroll.AUTOY);
 		setResizable(false);
 		setButtons(Dialog.OK);
-		
 		getButtonById(Dialog.OK).setText("Save");
-		
 		getButtonById(Dialog.OK).addListener(Events.Select, new Listener<BaseEvent>() {
 
 			@Override
 			public void handleEvent(BaseEvent be) {
-				saveProperties();
+				saveProperties(true);
 			}
 		});
 	}
@@ -96,7 +94,7 @@ public class DialogEditProperties extends Dialog{
 		removeAll();
 	}
 	
-	private void saveProperties(){
+	private void saveProperties(final boolean closeOnSuccess){
 		Map<String,String> prp = new HashMap<String, String>(fields.size());
 		for (TextField<String> field : fields) {
 			prp.put(field.getFieldLabel(), field.getValue());
@@ -112,6 +110,8 @@ public class DialogEditProperties extends Dialog{
 			@Override
 			public void onSuccess(Void result) {
 				commad.execute();
+				if(closeOnSuccess)
+				DialogEditProperties.this.hide();
 			}
 		});