diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java b/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java
index 8f0683820b..e1c807717f 100644
--- a/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java
+++ b/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java
@@ -276,7 +276,8 @@ public class CButton extends JButton implements CEditor {
 	 */
 	public void setToolTipText(String text) {
 		if (text == null) {
-			super.setText(text);
+			//super.setText(text); Angelo Dabala' (genied) fixed, was calling the wrong method
+			super.setToolTipText(text);
 			return;
 		}
 		int pos = text.indexOf('&');