diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java
index ce273b205ea753b1fdafb8d64e4812d7fc4414c7..7d3a54dc48c19130f75473580c84ca6e9eb1d354 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java
@@ -489,8 +489,7 @@ public class AddPropertyTypeDialog extends AbstractRegistrationDialog
                 propertyType = propertyTypeSelectionWidget.tryGetSelectedPropertyType();
             }
 
-            inMemoryGridCallback.callback(isExixtingPropertyType, propertyType, assignment);
-            this.close();
+            inMemoryGridCallback.callback(isExixtingPropertyType, propertyType, assignment, this);
         }
     }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
index 31cb7d783c36cf56028d779cdeb9ebde43d94287..86a9ca4016784fa891c454b281f10b606c1c6e8c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
@@ -370,7 +370,7 @@ public class PropertyTypeAssignmentGrid extends TypedTableGrid<EntityTypePropert
 
     public class InMemoryGridAddCallback
     {
-        public void callback(boolean isExixtingPropertyType, PropertyType propertyType, NewETPTAssignment assignment)
+        public void callback(boolean isExixtingPropertyType, PropertyType propertyType, NewETPTAssignment assignment, AddPropertyTypeDialog dialog)
         {
             NewPTNewAssigment newPTNewAssigment = new NewPTNewAssigment();
             newPTNewAssigment.setExistingPropertyType(isExixtingPropertyType);
@@ -379,11 +379,12 @@ public class PropertyTypeAssignmentGrid extends TypedTableGrid<EntityTypePropert
             try
             {
                 newTypeWithAssigments.refreshOrderAdd(newPTNewAssigment);
+                dialog.close();
+                refresh();
             } catch (Exception ex)
             {
                 MessageBox.alert("Error", ex.getMessage(), null);
             }
-            refresh();
         }
     }