diff --git a/data/servicetypes/plasma-applet-popupapplet.desktop b/data/servicetypes/plasma-applet-popupapplet.desktop
index 09b2afb86..2e6a496c4 100644
--- a/data/servicetypes/plasma-applet-popupapplet.desktop
+++ b/data/servicetypes/plasma-applet-popupapplet.desktop
@@ -18,7 +18,7 @@ Comment[en_GB]=Plasma scripting popup applet
 Comment[es]=Miniaplicación emergente de script para Plasma
 Comment[et]=Plasma skriptimise hüpikaplett
 Comment[eu]=Plasma scripting popup appleta
-Comment[fi]=Plasma ponnahdusikkunoiden skriptisovelma
+Comment[fi]=Skriptikielellä tehty Plasma-ponnahdussovelma
 Comment[fr]=Applet de script Plasma
 Comment[fy]=Plasma scripting popup applet
 Comment[ga]=Feidhmchláirín aníos scriptithe Plasma
diff --git a/dialog.cpp b/dialog.cpp
index 6d6090d65..4a76425ca 100644
--- a/dialog.cpp
+++ b/dialog.cpp
@@ -174,7 +174,8 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded)
     qreal bottomHeight(0);
 
     //decide about disabling the border attached to the panel
-    if (applet) {
+    //don't cut borders on tooltips
+    if (applet && !q->testAttribute(Qt::WA_X11NetWmWindowTypeToolTip)) {
         background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight);
 
         switch (applet->location()) {
@@ -226,7 +227,7 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded)
     }
 
     //decide if to disable the other borders
-    if (q->isVisible()) {
+    if (q->isVisible() && !q->testAttribute(Qt::WA_X11NetWmWindowTypeToolTip)) {
         if (dialogGeom.left() <= avail.left()) {
             borders &= ~FrameSvg::LeftBorder;
         }
diff --git a/widgets/toolbutton.h b/widgets/toolbutton.h
index f65a754d3..1281746ce 100644
--- a/widgets/toolbutton.h
+++ b/widgets/toolbutton.h
@@ -186,7 +186,7 @@ protected:
     QVariant itemChange(GraphicsItemChange change, const QVariant &value); 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;
 
-private slots:
+private Q_SLOTS:
     void setAnimationUpdate(qreal progress);
     qreal animationUpdate() const;