diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index d8ca76677e3ccd5db2c2cf5eabada5e8cd11eab5..c260c9e91184bf220fd620d10d7fb8c3e0e62d95 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -2000,7 +2000,13 @@ function ChatViewContent(props: ChatViewProps) {
             `${updateFailed ? "Could not update" : "Updating"} ${versionMismatchServerLabel}`
           ) : versionMismatch ? (
             <Tooltip>
-              <TooltipTrigger render={<span>Server update available</span>} />
+              <TooltipTrigger
+                render={
+                  <button type="button" className="cursor-help rounded-sm text-left">
+                    Server update available
+                  </button>
+                }
+              />
               <TooltipPopup side="top">
                 {versionMismatchServerLabel} {versionMismatch.serverVersion}{" "}
                 <span aria-hidden="true">→</span> {versionMismatch.clientVersion}
diff --git a/apps/web/src/components/settings/ConnectionsSettings.tsx b/apps/web/src/components/settings/ConnectionsSettings.tsx
index 35bd6ec65c90f0ec626844551ee6e2144b499f5e..300c71a338f424786b8cfeb6c604c1fb7bbab972 100644
--- a/apps/web/src/components/settings/ConnectionsSettings.tsx
+++ b/apps/web/src/components/settings/ConnectionsSettings.tsx
@@ -1431,7 +1431,12 @@ function SavedBackendListRow({
             <Tooltip>
               <TooltipTrigger
                 render={
-                  <p className="w-fit text-muted-foreground text-xs">Server update available</p>
+                  <button
+                    type="button"
+                    className="w-fit cursor-help rounded-sm text-left text-muted-foreground text-xs"
+                  >
+                    Server update available
+                  </button>
                 }
               />
               <TooltipPopup side="top">
@@ -3008,7 +3013,11 @@ export function ConnectionsSettings() {
                   ) : primaryVersionMismatch ? (
                     <Tooltip>
                       <TooltipTrigger
-                        render={<span className="w-fit">Update to match this client.</span>}
+                        render={
+                          <button type="button" className="w-fit cursor-help rounded-sm text-left">
+                            Update to match this client.
+                          </button>
+                        }
                       />
                       <TooltipPopup side="top">
                         {primaryVersionMismatch.serverVersion} <span aria-hidden="true">→</span>{" "}