diff --git a/tooltipmanager.cpp b/tooltipmanager.cpp
index 3ed192a8f..000f114a9 100644
--- a/tooltipmanager.cpp
+++ b/tooltipmanager.cpp
@@ -39,13 +39,14 @@
 #endif
 
 //Plasma
-#include <applet.h>
-#include <containment.h>
-#include <corona.h>
-#include <framesvg.h>
-#include <theme.h>
-#include <view.h>
-#include <private/tooltip_p.h>
+#include "plasma/applet.h"
+#include "plasma/containment.h"
+#include "plasma/corona.h"
+#include "plasma/framesvg.h"
+#include "plasma/popupapplet.h"
+#include "plasma/theme.h"
+#include "plasma/view.h"
+#include "plasma/private/tooltip_p.h"
 
 namespace Plasma
 {
@@ -300,6 +301,11 @@ void ToolTipManagerPrivate::showToolTip()
         return;
     }
 
+    PopupApplet *popup = qobject_cast<PopupApplet*>(currentWidget);
+    if (popup && popup->isPopupShowing()) {
+        return;
+    }
+
     QMetaObject::invokeMethod(currentWidget, "toolTipAboutToShow");
     QHash<QGraphicsWidget *, ToolTipContent>::const_iterator tooltip = tooltips.constFind(currentWidget);