diff --git a/src/declarativeimports/core/tooltip.cpp b/src/declarativeimports/core/tooltip.cpp
index a9842aded..25b2f6dbe 100644
--- a/src/declarativeimports/core/tooltip.cpp
+++ b/src/declarativeimports/core/tooltip.cpp
@@ -232,7 +232,8 @@ void ToolTip::hoverEnterEvent(QHoverEvent *event)
         ToolTipDialog::instance()->keepalive();
         //FIXME: showToolTip needs to be renamed in sync or something like that
         showToolTip();
-    } else if (!m_mainItem && !mainText().isEmpty() && !subText().isEmpty()) {
+    } else if (m_mainItem ||
+        (!mainText().isEmpty() && !subText().isEmpty())) {
         m_showTimer->start(500);
     }
 }