diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/EditorBox.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/EditorBox.java
index f706a867d4..e857f4ab24 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/EditorBox.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/EditorBox.java
@@ -161,4 +161,11 @@ public class EditorBox extends Div {
 	public void setToolTipText(String tooltiptext) {
 		txt.setTooltiptext(tooltiptext);
 	}
+	
+	/**
+	 * @return Button
+	 */
+	public Button getButton() {
+		return btn;
+	}
 }
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
index 65780cf751..a1c3856bcb 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
@@ -292,12 +292,14 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener
 
 	@Override
 	public boolean isReadWrite() {
-		return !getComponent().getTextbox().isReadonly();
+		return getComponent().getButton().isEnabled();
 	}
 
 	@Override
 	public void setReadWrite(boolean readWrite) {
 		getComponent().setEnabled(readWrite);
+		
+		getComponent().getTextbox().setReadonly(true);
 	}