diff --git a/private/tooltip.cpp b/private/tooltip.cpp
index 480ec1d25..ecd4ff93c 100644
--- a/private/tooltip.cpp
+++ b/private/tooltip.cpp
@@ -169,6 +169,8 @@ ToolTip::~ToolTip()
 void ToolTip::checkSize()
 {
     //FIXME: layout bugs even on qlayouts? oh, please, no.
+    d->text->setMinimumSize(0, 0);
+    d->text->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
     d->text->setMinimumSize(d->text->minimumSizeHint());
     d->text->setMaximumSize(d->text->maximumSizeHint());
 
diff --git a/tooltipmanager.cpp b/tooltipmanager.cpp
index 2ecf7fb92..42a7283cb 100644
--- a/tooltipmanager.cpp
+++ b/tooltipmanager.cpp
@@ -217,6 +217,8 @@ void ToolTipManager::setContent(QGraphicsWidget *widget, const ToolTipContent &d
         }
 
         d->tipWidget->setContent(widget, data);
+        d->tipWidget->prepareShowing();
+        d->tipWidget->moveTo(m_corona->popupPosition(d->currentWidget, d->tipWidget->size()));
     }
 }