diff --git a/web/components/editor.tsx b/web/components/editor.tsx
index d8a8d37f..468f2cca 100644
--- a/web/components/editor.tsx
+++ b/web/components/editor.tsx
@@ -33,6 +33,7 @@ import { Row } from './layout/row'
 import { Spacer } from './layout/spacer'
 import { MarketModal } from './editor/market-modal'
 import { insertContent } from './editor/utils'
+import { Tooltip } from './tooltip'
 
 const DisplayImage = Image.configure({
   HTMLAttributes: {
@@ -155,15 +156,15 @@ export function TextEditor(props: {
           <EditorContent editor={editor} />
           {/* Toolbar, with buttons for images and embeds */}
           <div className="flex h-9 items-center gap-5 pl-4 pr-1">
-            <div className="tooltip flex items-center" data-tip="Add image">
+            <Tooltip className="flex items-center" text="Add image" noTap>
               <FileUploadButton
                 onFiles={upload.mutate}
                 className="-m-2.5 flex h-10 w-10 items-center justify-center rounded-full text-gray-400 hover:text-gray-500"
               >
                 <PhotographIcon className="h-5 w-5" aria-hidden="true" />
               </FileUploadButton>
-            </div>
-            <div className="tooltip flex items-center" data-tip="Add embed">
+            </Tooltip>
+            <Tooltip className="flex items-center" text="Add embed" noTap>
               <button
                 type="button"
                 onClick={() => setIframeOpen(true)}
@@ -176,8 +177,8 @@ export function TextEditor(props: {
                 />
                 <CodeIcon className="h-5 w-5" aria-hidden="true" />
               </button>
-            </div>
-            <div className="tooltip flex items-center" data-tip="Add market">
+            </Tooltip>
+            <Tooltip className="flex items-center" text="Add market" noTap>
               <button
                 type="button"
                 onClick={() => setMarketOpen(true)}
@@ -193,7 +194,7 @@ export function TextEditor(props: {
                   aria-hidden="true"
                 />
               </button>
-            </div>
+            </Tooltip>
             {/* Spacer that also focuses editor on click */}
             <div
               className="grow cursor-text self-stretch"
diff --git a/web/components/tooltip.tsx b/web/components/tooltip.tsx
index 91f29c48..3a7ab2ab 100644
--- a/web/components/tooltip.tsx
+++ b/web/components/tooltip.tsx
@@ -46,7 +46,7 @@ export function Tooltip(props: {
   }[placement.split('-')[0]] as string
 
   return text ? (
-    <>
+    <div className="contents">
       <div
         className={clsx('peer inline-block', className)}
         ref={reference}
@@ -74,7 +74,7 @@ export function Tooltip(props: {
           }}
         />
       </div>
-    </>
+    </div>
   ) : (
     <>{children}</>
   )