diff --git a/declarativeimports/core/dialog.cpp b/declarativeimports/core/dialog.cpp
index 65149ae26..d47ab1329 100644
--- a/declarativeimports/core/dialog.cpp
+++ b/declarativeimports/core/dialog.cpp
@@ -65,7 +65,7 @@ void Dialog::setEdge(const Plasma::Types::Location &edge)
 bool Dialog::isRespectingAppletsLayoutGeometry() const
 {
     //! As it appears plasma applets popups are defining their popups to Normal window.
-    return (type() == Dialog::Normal || type() == Dialog::PopupMenu);
+    return (type() == Dialog::Normal || type() == Dialog::PopupMenu || type() == Dialog::Tooltip);
 }
 
 QRect Dialog::appletsLayoutGeometryFromContainment() const
diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml
index 6d06a399d..2512f97fd 100644
--- a/plasmoid/package/contents/ui/main.qml
+++ b/plasmoid/package/contents/ui/main.qml
@@ -341,8 +341,8 @@ Item {
         type: plasmoid.configuration.previewWindowAsPopup ? PlasmaCore.Dialog.PopupMenu : PlasmaCore.Dialog.Tooltip
         flags: plasmoid.configuration.previewWindowAsPopup ? Qt.WindowStaysOnTopHint | Qt.WindowDoesNotAcceptFocus | Qt.Popup :
                                                              Qt.WindowStaysOnTopHint | Qt.WindowDoesNotAcceptFocus | Qt.ToolTip
-
         location: root.location
+        edge: root.location
         mainItem: toolTipDelegate
         visible: false