diff --git a/lib/kdecoration.cpp b/lib/kdecoration.cpp
index c23cec0e58..b449cc8111 100644
--- a/lib/kdecoration.cpp
+++ b/lib/kdecoration.cpp
@@ -82,7 +82,8 @@ void KDecoration::createMainWidget( Qt::WFlags flags )
     QWidget *w = new QWidget( initialParentWidget(), initialWFlags() | flags );
     w->setObjectName("decoration widget");
     w->setAttribute( Qt::WA_PaintOnScreen );
-    w->setAttribute( Qt::WA_AlwaysShowToolTips );
+    if ( options()->showTooltips() )
+        w->setAttribute( Qt::WA_AlwaysShowToolTips );
     setMainWidget(w);
     }