diff --git a/theme/noctalia-plugins/stoa-doctor-pill/BarWidget.qml b/theme/noctalia-plugins/stoa-doctor-pill/BarWidget.qml
index 6ea7644..c4393a2 100644
--- a/theme/noctalia-plugins/stoa-doctor-pill/BarWidget.qml
+++ b/theme/noctalia-plugins/stoa-doctor-pill/BarWidget.qml
@@ -24,7 +24,18 @@ import qs.Widgets
 Item {
     id: root
 
-    property var pluginApi: null
+    property var    pluginApi: null
+    property ShellScreen screen
+    property string widgetId: ""
+    property string section: ""
+    property int    sectionWidgetIndex: -1
+
+    property string tooltipText: issues < 0 ? "Doctor log not found — run stoa-doctor"
+        : issues > 0
+            ? issues + " issue" + (issues > 1 ? "s" : "") +
+              (warnings > 0 ? "  ·  " + warnings + " warning" + (warnings > 1 ? "s" : "") : "")
+        : warnings > 0 ? warnings + " warning" + (warnings > 1 ? "s" : "")
+        : "All systems nominal"
 
     implicitWidth:  pill.implicitWidth + Style.marginM * 2
     implicitHeight: parent ? parent.height : 32
@@ -67,19 +78,6 @@ Item {
         }
     }
 
-    NToolTip {
-        target: root
-        text: root.issues < 0 ? "Doctor log not found — run stoa-doctor"
-              : root.issues > 0
-                  ? root.issues + " issue" + (root.issues > 1 ? "s" : "") +
-                    (root.warnings > 0
-                        ? "  ·  " + root.warnings + " warning" + (root.warnings > 1 ? "s" : "")
-                        : "")
-              : root.warnings > 0
-                  ? root.warnings + " warning" + (root.warnings > 1 ? "s" : "")
-              : "All systems nominal"
-    }
-
     // ── Click → popup menu ──
     MouseArea {
         anchors.fill: parent
diff --git a/theme/noctalia-plugins/stoa-drive-pill/BarWidget.qml b/theme/noctalia-plugins/stoa-drive-pill/BarWidget.qml
index d13235c..5ece4da 100644
--- a/theme/noctalia-plugins/stoa-drive-pill/BarWidget.qml
+++ b/theme/noctalia-plugins/stoa-drive-pill/BarWidget.qml
@@ -26,7 +26,18 @@ import qs.Widgets
 Item {
     id: root
 
-    property var pluginApi: null
+    property var    pluginApi: null
+    property ShellScreen screen
+    property string widgetId: ""
+    property string section: ""
+    property int    sectionWidgetIndex: -1
+
+    property string tooltipText: !_available      ? "rclone not installed"
+        : total === 0    ? "No cloud drives configured"
+        : mounted === total
+                         ? "All drives mounted (" + total + "/" + total + ")"
+        : mounted > 0    ? mounted + " / " + total + " drives mounted"
+                         : "No drives mounted — click to manage"
 
     visible: _available
     implicitWidth:  visible ? pill.implicitWidth + Style.marginM * 2 : 0
@@ -68,16 +79,6 @@ Item {
         }
     }
 
-    NToolTip {
-        target: root
-        text: !root._available      ? "rclone not installed"
-              : root.total === 0    ? "No cloud drives configured"
-              : root.mounted === root.total
-                                    ? "All drives mounted (" + root.total + "/" + root.total + ")"
-              : root.mounted > 0    ? root.mounted + " / " + root.total + " drives mounted"
-                                    : "No drives mounted — click to manage"
-    }
-
     // ── Click → popup ──
     MouseArea {
         anchors.fill: parent