diff --git a/.changeset/long-corners-repair.md b/.changeset/long-corners-repair.md
new file mode 100644
index 000000000..084d5c9c0
--- /dev/null
+++ b/.changeset/long-corners-repair.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/pacer-devtools': patch
+---
+
+Moves devtools theme to the component to avoid theme mismatch.
diff --git a/packages/pacer-devtools/src/PacerDevtools.tsx b/packages/pacer-devtools/src/components/index.tsx
similarity index 63%
rename from packages/pacer-devtools/src/PacerDevtools.tsx
rename to packages/pacer-devtools/src/components/index.tsx
index 6a378dddb..d3449366f 100644
--- a/packages/pacer-devtools/src/PacerDevtools.tsx
+++ b/packages/pacer-devtools/src/components/index.tsx
@@ -1,14 +1,14 @@
 import { ThemeContextProvider } from '@tanstack/devtools-ui'
-import { PacerContextProvider } from './PacerContextProvider'
-import { Shell } from './components/Shell'
+import { PacerContextProvider } from '../PacerContextProvider'
+import { Shell } from './Shell'
 
 import type { TanStackDevtoolsTheme } from '@tanstack/devtools-ui'
 
-interface PacerDevtools {
+interface DevtoolsProps {
   theme: TanStackDevtoolsTheme
 }
 
-export default function PacerDevtools(props: PacerDevtools) {
+export default function PacerDevtools(props: DevtoolsProps) {
   return (
     <ThemeContextProvider theme={props.theme}>
       <PacerContextProvider>
diff --git a/packages/pacer-devtools/src/core.tsx b/packages/pacer-devtools/src/core.tsx
index cf67bbdfb..ea380393a 100644
--- a/packages/pacer-devtools/src/core.tsx
+++ b/packages/pacer-devtools/src/core.tsx
@@ -3,7 +3,7 @@ import { constructCoreClass } from '@tanstack/devtools-utils/solid'
 export interface PacerDevtoolsInit {}
 
 const [PacerDevtoolsCore, PacerDevtoolsCoreNoOp] = constructCoreClass(
-  () => import('./PacerDevtools'),
+  () => import('./components'),
 )
 
 export { PacerDevtoolsCore, PacerDevtoolsCoreNoOp }