1 files changed, 3 insertions, 5 deletions
diff --git a/src/com/itmill/toolkit/ui/AbstractComponent.java b/src/com/itmill/toolkit/ui/AbstractComponent.java
index 6c453d0a57..6c2a04f170 100644
--- a/src/com/itmill/toolkit/ui/AbstractComponent.java
+++ b/src/com/itmill/toolkit/ui/AbstractComponent.java
@@ -533,15 +533,13 @@ public abstract class AbstractComponent implements Component, MethodEventSource
 
 			// Only paint content of visible components.
 			if (isVisible()) {
-				paintContent(target);
-
 				String desc = getDescription();
 				if (desc != null && description.length() > 0) {
-					target.startTag("description");
-					target.addUIDL(getDescription());
-					target.endTag("description");
+					target.addAttribute("description", getDescription());
 				}
 
+				paintContent(target);
+
 				ErrorMessage error = getErrorMessage();
 				if (error != null)
 					error.paint(target);