diff --git a/.changeset/chatty-parents-drum.md b/.changeset/chatty-parents-drum.md
new file mode 100644
index 000000000..6ac814ae8
--- /dev/null
+++ b/.changeset/chatty-parents-drum.md
@@ -0,0 +1,5 @@
+---
+"@hyperdx/app": patch
+---
+
+Small fix for html structure nesting issues
diff --git a/packages/app/src/components/DBTable/DBRowTableIconButton.tsx b/packages/app/src/components/DBTable/DBRowTableIconButton.tsx
index c409c477a..409cb176e 100644
--- a/packages/app/src/components/DBTable/DBRowTableIconButton.tsx
+++ b/packages/app/src/components/DBTable/DBRowTableIconButton.tsx
@@ -51,8 +51,10 @@ export const DBRowTableIconButton: React.FC<DBRowTableIconButtonProps> = ({
     >
       <UnstyledButton
         onClick={handleClick}
+        component="div"
         className={baseClasses}
         tabIndex={tabIndex}
+        role="button"
       >
         {isActive ? <IconCheck size={iconSize} /> : children}
       </UnstyledButton>
diff --git a/packages/app/src/components/SQLInlineEditor.tsx b/packages/app/src/components/SQLInlineEditor.tsx
index f7fa56846..686f53a96 100644
--- a/packages/app/src/components/SQLInlineEditor.tsx
+++ b/packages/app/src/components/SQLInlineEditor.tsx
@@ -327,6 +327,7 @@ export default function SQLInlineEditor({
           style={{
             whiteSpace: 'nowrap',
           }}
+          component="div"
         >
           <Tooltip label={tooltipText} disabled={!tooltipText}>
             <Flex align="center" gap={2}>
diff --git a/packages/app/tests/e2e/features/shared/multiline.spec.ts b/packages/app/tests/e2e/features/shared/multiline.spec.ts
index 0d8daa3c4..e4fa4cbc1 100644
--- a/packages/app/tests/e2e/features/shared/multiline.spec.ts
+++ b/packages/app/tests/e2e/features/shared/multiline.spec.ts
@@ -110,7 +110,7 @@ test.describe('Multiline Input', { tag: '@search' }, () => {
       if (config.mode === 'SQL') {
         const scopedContainer = formSelector ? container : page;
         const whereLabel = scopedContainer.locator(
-          `p.mantine-Text-root:has-text("${whereText}")`,
+          `div.mantine-Text-root:has-text("${whereText}")`,
         );
         await expect(whereLabel).toBeVisible();
       }
@@ -122,7 +122,7 @@ test.describe('Multiline Input', { tag: '@search' }, () => {
         ? (() => {
             const scopedContainer = formSelector ? container : page;
             const whereContainer = scopedContainer.locator(
-              `div:has(p.mantine-Text-root:has-text("${whereText}"))`,
+              `div:has(div.mantine-Text-root:has-text("${whereText}"))`,
             );
             return whereContainer.locator('.cm-editor').first();
           })()