diff --git a/assets/components/tracking/watchlist/WatchlistCard.tsx b/assets/components/tracking/watchlist/WatchlistCard.tsx
index 6abc64f..334fe28 100644
--- a/assets/components/tracking/watchlist/WatchlistCard.tsx
+++ b/assets/components/tracking/watchlist/WatchlistCard.tsx
@@ -1,4 +1,4 @@
-import {Card, Divider, Space, Table, Tag, Tooltip, Typography} from "antd";
+import {Card, Divider, Space, Table, Tag, Tooltip} from "antd";
 import {DisconnectOutlined, LinkOutlined} from "@ant-design/icons";
 import {t} from "ttag";
 import {ViewDiagramWatchlistButton} from "./diagram/ViewDiagramWatchlistButton";
@@ -41,13 +41,16 @@ export function WatchlistCard({watchlist, onUpdateWatchlist, connectors, onDelet
             title={<>
                 {
                     watchlist.connector ?
-                        <Tag icon={<LinkOutlined/>} color="lime-inverse" title={watchlist.connector.id}/> :
-                        <Tag icon={<DisconnectOutlined/>} color="default"
-                             title={t`This Watchlist is not linked to a Connector.`}/>
+                        <Tooltip title={watchlist.connector.id}>
+                            <Tag icon={<LinkOutlined/>} color="lime-inverse"/>
+                        </Tooltip> :
+                        <Tooltip title={t`This Watchlist is not linked to a Connector.`}>
+                            <Tag icon={<DisconnectOutlined/>} color="default"/>
+                        </Tooltip>
                 }
-                <Typography.Text title={new Date(watchlist.createdAt).toLocaleString()}>
+                <Tooltip title={new Date(watchlist.createdAt).toLocaleString()}>
                     {t`Watchlist` + (watchlist.name ? ` (${watchlist.name})` : '')}
-                </Typography.Text>
+                </Tooltip>
             </>
             }
             size='small'
diff --git a/translations/translations.pot b/translations/translations.pot
index 1f6a7b2..7422c35 100644
--- a/translations/translations.pot
+++ b/translations/translations.pot
@@ -697,11 +697,11 @@ msgstr ""
 msgid "Are you sure to delete this Watchlist?"
 msgstr ""
 
-#: assets/components/tracking/watchlist/WatchlistCard.tsx:46
+#: assets/components/tracking/watchlist/WatchlistCard.tsx:47
 msgid "This Watchlist is not linked to a Connector."
 msgstr ""
 
-#: assets/components/tracking/watchlist/WatchlistCard.tsx:49
+#: assets/components/tracking/watchlist/WatchlistCard.tsx:52
 msgid "Watchlist"
 msgstr ""