1 files changed, 7 insertions, 5 deletions
diff --git a/plugins/CoreHome/vue/src/Widget/Widget.vue b/plugins/CoreHome/vue/src/Widget/Widget.vue
index 45bffe66d3..725aa6f694 100644
--- a/plugins/CoreHome/vue/src/Widget/Widget.vue
+++ b/plugins/CoreHome/vue/src/Widget/Widget.vue
@@ -8,6 +8,7 @@
   <div
     v-if="actualWidget"
     v-show="showWidget"
+    class="matomo-widget"
     :class="{'isFirstWidgetInPage': actualWidget.isFirstInPage}"
     :id="actualWidget.uniqueId"
     v-tooltips="{ content: tooltipContent }"
@@ -35,10 +36,11 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
+import JQuery = JQuery;
 import WidgetLoader from '../WidgetLoader/WidgetLoader.vue';
 import WidgetContainer from '../WidgetContainer/WidgetContainer.vue';
 import WidgetByDimensionContainer from '../WidgetByDimensionContainer/WidgetByDimensionContainer.vue';
-import WidgetsStoreInstance, { WidgetData, ContainerWidgetData } from './Widgets.store';
+import WidgetsStoreInstance, { Widget as WidgetData, ContainerWidget } from './Widgets.store';
 import AjaxHelper from '../AjaxHelper/AjaxHelper';
 import ReportMetadataStoreInstance from '../ReportMetadata/ReportMetadata.store';
 import Tooltips from '../Tooltips/Tooltips';
@@ -46,8 +48,8 @@ import Tooltips from '../Tooltips/Tooltips';
 function findContainer(
   widgetsByCategory: typeof WidgetsStoreInstance.widgets.value,
   containerId: string,
-): ContainerWidgetData|undefined {
-  let widget: ContainerWidgetData;
+): ContainerWidget|undefined {
+  let widget: ContainerWidget;
   Object.values(widgetsByCategory || {}).some((widgets) => {
     widget = widgets.find((w) => w && w.isContainer && w.parameters.containerId === containerId);
     return widget;
@@ -103,8 +105,8 @@ export default defineComponent({
   },
   setup() {
     function tooltipContent() {
-      const $this = window.$(this);
-      if ($this.attr('piwik-field') === '') {
+      const $this = window.$(this) as JQuery;
+      if ($this.attr('piwik-field') === '' || $this.hasClass('matomo-form-field')) {
         // do not show it for form fields
         return '';
       }