diff --git a/packages/desktop/index.html b/packages/desktop/index.html
index a7ee5d5f67..57e10defac 100644
--- a/packages/desktop/index.html
+++ b/packages/desktop/index.html
@@ -3,13 +3,15 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>OpenCode</title>
     <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <link rel="shortcut icon" href="/favicon.ico" />
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
     <link rel="manifest" href="/site.webmanifest" />
     <meta name="theme-color" content="#000000" />
-    <title>OpenCode</title>
+    <meta property="og:image" content="/social-share.png" />
+    <meta property="twitter:image" content="/social-share.png" />
   </head>
   <body class="antialiased overscroll-none select-none text-12-regular">
     <script>
diff --git a/packages/desktop/public/social-share.png b/packages/desktop/public/social-share.png
new file mode 100644
index 0000000000..92224f54c1
Binary files /dev/null and b/packages/desktop/public/social-share.png differ
diff --git a/packages/enterprise/public/social-share.png b/packages/enterprise/public/social-share.png
new file mode 100644
index 0000000000..92224f54c1
Binary files /dev/null and b/packages/enterprise/public/social-share.png differ
diff --git a/packages/enterprise/src/entry-server.tsx b/packages/enterprise/src/entry-server.tsx
index 436a155c36..df095023a5 100644
--- a/packages/enterprise/src/entry-server.tsx
+++ b/packages/enterprise/src/entry-server.tsx
@@ -9,6 +9,8 @@ export default createHandler(() => (
           <meta charset="utf-8" />
           <meta name="viewport" content="width=device-width, initial-scale=1" />
           <title>OpenCode</title>
+          <meta property="og:image" content="/social-share.png" />
+          <meta property="twitter:image" content="/social-share.png" />
           {assets}
         </head>
         <body class="antialiased overscroll-none select-none text-12-regular">
diff --git a/packages/ui/src/components/message-nav.tsx b/packages/ui/src/components/message-nav.tsx
index 134769dfcb..1a1d2a1b57 100644
--- a/packages/ui/src/components/message-nav.tsx
+++ b/packages/ui/src/components/message-nav.tsx
@@ -64,7 +64,7 @@ export function MessageNav(
   return (
     <Switch>
       <Match when={local.size === "compact"}>
-        <Tooltip openDelay={0} closeDelay={0} placement="left-start" gutter={-65} shift={-16} overlap>
+        <Tooltip openDelay={0} closeDelay={300} placement="left-start" gutter={-65} shift={-16} overlap>
           <Tooltip.Trigger as="div">{content()}</Tooltip.Trigger>
           <Tooltip.Portal>
             <Tooltip.Content data-slot="message-nav-tooltip">
diff --git a/packages/web/public/social-share.png b/packages/web/public/social-share.png
index 97f67994dd..92224f54c1 100644
Binary files a/packages/web/public/social-share.png and b/packages/web/public/social-share.png differ
