diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
index 0c318c0f8a..ad530fc84c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
@@ -575,7 +575,6 @@ public class WAttachment extends Window implements EventListener<Event>
 		} else if (e.getTarget() == bDeleteAll) {
 			//	Delete Attachment
 			deleteAttachment();
-			dispose();
 		} else if (e.getTarget() == bDelete) {
 			//	Delete individual entry and Return
 			deleteAttachmentEntry();
@@ -676,6 +675,7 @@ public class WAttachment extends Window implements EventListener<Event>
 						m_attachment.delete(true);
 						m_attachment = null;
 					}
+					dispose();
 				}					
 			}
 		});