diff --git a/panels/dock/workspaceitem/package/workspaceitem.qml b/panels/dock/workspaceitem/package/workspaceitem.qml
index cedfe032f..94c7df441 100644
--- a/panels/dock/workspaceitem/package/workspaceitem.qml
+++ b/panels/dock/workspaceitem/package/workspaceitem.qml
@@ -90,10 +90,8 @@ AppletItem {
                     Applet.dataModel.currentIndex =  content.index
                 }
                 onEntered: {
-                    var point = content.mapToItem(null, content.width / 2, 0)
-                    toolTip.toolTipX = point.x
-                    toolTip.toolTipY = point.y
-                    toolTip.text = workspaceName
+                    var point = content.mapToItem(null, content.width / 2, content.height / 2)
+                    toolTip.DockPanelPositioner.bounding = Qt.rect(point.x, point.y, toolTip.width, toolTip.height)
                     toolTip.open()
                 }
 
@@ -106,6 +104,9 @@ AppletItem {
 
     PanelToolTip {
         id: toolTip
+        toolTipX: DockPanelPositioner.x
+        toolTipY: DockPanelPositioner.y
+        text: listView.currentItem ? listView.currentItem.workspaceName : ""
     }
 
     Rectangle {