diff --git a/apps/studio/components/ui/ErrorBoundaryState.tsx b/apps/studio/components/ui/ErrorBoundaryState.tsx
deleted file mode 100644
index cf29098fe42..00000000000
--- a/apps/studio/components/ui/ErrorBoundaryState.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { isError } from 'lodash'
-import { ExternalLink } from 'lucide-react'
-import Link from 'next/link'
-import { useRouter } from 'next/router'
-
-import {
-  AlertDescription_Shadcn_,
-  AlertTitle_Shadcn_,
-  Alert_Shadcn_,
-  Button,
-  WarningIcon,
-} from 'ui'
-
-// More correct version of FallbackProps from react-error-boundary
-export type FallbackProps = {
-  error: unknown
-  resetErrorBoundary: (...args: any[]) => void
-}
-
-export const ErrorBoundaryState = ({ error, resetErrorBoundary }: FallbackProps) => {
-  const router = useRouter()
-  const checkIsError = isError(error)
-
-  const errorMessage = checkIsError ? error.message : ''
-  const urlMessage = checkIsError ? `Path name: ${router.pathname}\n\n${error?.stack}` : ''
-  const isRemoveChildError = checkIsError
-    ? errorMessage.includes("Failed to execute 'removeChild' on 'Node'")
-    : false
-
-  return (
-    <div className="w-screen h-screen flex items-center justify-center flex-col gap-y-3">
-      <div className="flex items-center flex-col gap-y-1">
-        <p className="text-sm">
-          Application error: a client-side exception has occurred (see browser console for more
-          information)
-        </p>
-        <p className="text-sm text-foreground-light">Error: {errorMessage}</p>
-      </div>
-
-      {isRemoveChildError && (
-        <Alert_Shadcn_ className="w-[650px]">
-          <WarningIcon />
-          <AlertTitle_Shadcn_>
-            This error might be caused by Google translate or third-party browser extensions
-          </AlertTitle_Shadcn_>
-          <AlertDescription_Shadcn_>
-            You may try to avoid using Google translate or disable certain browser extensions to
-            avoid running into the <code className="text-xs">'removeChild' on 'Node'</code> error.
-          </AlertDescription_Shadcn_>
-          <AlertDescription_Shadcn_ className="mt-3">
-            <Button asChild type="default" icon={<ExternalLink />}>
-              <a
-                target="_blank"
-                rel="noreferrer"
-                href="https://github.com/facebook/react/issues/17256"
-              >
-                More information
-              </a>
-            </Button>
-          </AlertDescription_Shadcn_>
-        </Alert_Shadcn_>
-      )}
-
-      <div className="flex items-center justify-center gap-x-2">
-        <Button asChild type="default" icon={<ExternalLink />}>
-          <Link
-            href={`/support/new?category=dashboard_bug&subject=Client%20side%20exception%20occurred%20on%20dashboard&message=${encodeURI(urlMessage)}`}
-            target="_blank"
-          >
-            Report to support
-          </Link>
-        </Button>
-        {/* [Joshen] For local and staging, allow us to escape the error boundary */}
-        {/* We could actually investigate how to make this available on prod, but without being able to reliably test this, I'm not keen to do it now */}
-        {process.env.NEXT_PUBLIC_ENVIRONMENT !== 'prod' ? (
-          <Button type="outline" onClick={() => resetErrorBoundary()}>
-            Return to dashboard
-          </Button>
-        ) : (
-          <Button type="outline" onClick={() => router.reload()}>
-            Reload dashboard
-          </Button>
-        )}
-      </div>
-    </div>
-  )
-}
diff --git a/apps/studio/components/ui/GlobalErrorBoundaryState.tsx b/apps/studio/components/ui/GlobalErrorBoundaryState.tsx
new file mode 100644
index 00000000000..fbe2f76a020
--- /dev/null
+++ b/apps/studio/components/ui/GlobalErrorBoundaryState.tsx
@@ -0,0 +1,158 @@
+import { isError } from 'lodash'
+import { ExternalLink } from 'lucide-react'
+import Link from 'next/link'
+import { useRouter } from 'next/router'
+import CopyButton from './CopyButton'
+
+import Image from 'next/image'
+import {
+  AlertDescription_Shadcn_,
+  AlertTitle_Shadcn_,
+  Alert_Shadcn_,
+  Button,
+  WarningIcon,
+  cn,
+} from 'ui'
+import { InlineLinkClassName } from './InlineLink'
+
+// More correct version of FallbackProps from react-error-boundary
+export type FallbackProps = {
+  error: unknown
+  resetErrorBoundary: (...args: any[]) => void
+}
+
+export const GlobalErrorBoundaryState = ({ error, resetErrorBoundary }: FallbackProps) => {
+  const router = useRouter()
+  const checkIsError = isError(error)
+
+  const errorMessage = checkIsError ? error.message : ''
+  const urlMessage = checkIsError ? `Path name: ${router.pathname}\n\n${error?.stack}` : ''
+  const isRemoveChildError = checkIsError
+    ? errorMessage.includes("Failed to execute 'removeChild' on 'Node'")
+    : false
+
+  const handleClearStorage = () => {
+    try {
+      localStorage.clear()
+      sessionStorage.clear()
+    } catch (e) {
+      // ignore
+    }
+    window.location.reload()
+  }
+
+  return (
+    <div className="w-screen mx-auto h-screen flex items-center justify-center">
+      <header className="h-12 absolute top-0 w-full border-b px-4 flex items-center">
+        <Link href="/" className="items-center justify-center">
+          <Image
+            alt="Supabase"
+            src={`${router.basePath}/img/supabase-logo.svg`}
+            width={18}
+            height={18}
+            className="w-[18px] h-[18px]"
+          />
+        </Link>
+      </header>
+
+      <div className="flex flex-col gap-y-4 max-w-full sm:max-w-[660px] px-4 sm:px-0">
+        <div className="flex flex-col gap-y-1 text-left py-2 w-full">
+          <div className="flex items-center justify-between mb-3">
+            <p className="text-lg font-bold">Sorry! An unexpected error occured.</p>
+            <CopyButton type="outline" text={errorMessage} copyLabel="Copy error" />
+          </div>
+          <p className="text-sm">
+            Application error: a client-side exception has occurred (see browser console for more
+            information)
+          </p>
+          <p className="text-foreground-light text-sm">{errorMessage}</p>
+        </div>
+
+        {isRemoveChildError ? (
+          <Alert_Shadcn_>
+            <WarningIcon />
+            <AlertTitle_Shadcn_>
+              This error might be caused by Google translate or third-party browser extensions
+            </AlertTitle_Shadcn_>
+            <AlertDescription_Shadcn_>
+              You may try to avoid using Google translate or disable certain browser extensions to
+              avoid running into the <code className="text-xs">'removeChild' on 'Node'</code> error.
+            </AlertDescription_Shadcn_>
+            <AlertDescription_Shadcn_ className="mt-3">
+              <Button asChild type="default" icon={<ExternalLink />}>
+                <a
+                  target="_blank"
+                  rel="noreferrer"
+                  href="https://github.com/facebook/react/issues/17256"
+                >
+                  More information
+                </a>
+              </Button>
+            </AlertDescription_Shadcn_>
+          </Alert_Shadcn_>
+        ) : (
+          <Alert_Shadcn_>
+            <AlertTitle_Shadcn_>We recommend trying the following:</AlertTitle_Shadcn_>
+            <AlertDescription_Shadcn_>
+              <ul className="list-disc pl-2 list-inside text-sm space-y-1 [&_b]:font-medium [&_b]:text-foreground">
+                <li>
+                  <span
+                    className={cn(InlineLinkClassName, 'cursor-pointer')}
+                    onClick={() => window.location.reload()}
+                  >
+                    Refresh
+                  </span>{' '}
+                  the page
+                </li>
+                <li>
+                  <span
+                    className={cn(InlineLinkClassName, 'cursor-pointer')}
+                    onClick={() => router.push('/logout')}
+                  >
+                    Sign out
+                  </span>{' '}
+                  and sign back in
+                </li>
+                <li>
+                  <span
+                    className={cn(InlineLinkClassName, 'cursor-pointer')}
+                    onClick={handleClearStorage}
+                  >
+                    Clear your browser storage
+                  </span>{' '}
+                  to clean potentially outdated data
+                </li>
+                <li>
+                  Disable browser extensions that might modify page content (e.g., Google Translate)
+                </li>
+                <li>If the problem persists, please contact support for assistance</li>
+              </ul>
+            </AlertDescription_Shadcn_>
+          </Alert_Shadcn_>
+        )}
+
+        <div className="w-full sm:w-1/2 mx-auto grid grid-cols-2 gap-2">
+          <Button asChild type="default" icon={<ExternalLink />}>
+            <Link
+              href={`/support/new?category=dashboard_bug&subject=Client%20side%20exception%20occurred%20on%20dashboard&message=${encodeURI(urlMessage)}`}
+              target="_blank"
+            >
+              Contact support
+            </Link>
+          </Button>
+          {/* [Joshen] For local and staging, allow us to escape the error boundary */}
+          {/* We could actually investigate how to make this available on prod, but without being able to reliably test this, I'm not keen to do it now */}
+          {process.env.NEXT_PUBLIC_ENVIRONMENT !== 'prod' ? (
+            <Button type="outline" onClick={() => resetErrorBoundary()}>
+              Return to dashboard
+            </Button>
+          ) : (
+            <Button type="outline" onClick={() => router.reload()}>
+              Reload dashboard
+            </Button>
+          )}
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/studio/next-env.d.ts b/apps/studio/next-env.d.ts
index a4a7b3f5cfa..52e831b4342 100644
--- a/apps/studio/next-env.d.ts
+++ b/apps/studio/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
diff --git a/apps/studio/pages/_app.tsx b/apps/studio/pages/_app.tsx
index 82dde900ed4..f8f95bfbb55 100644
--- a/apps/studio/pages/_app.tsx
+++ b/apps/studio/pages/_app.tsx
@@ -40,7 +40,7 @@ import { FeaturePreviewContextProvider } from 'components/interfaces/App/Feature
 import FeaturePreviewModal from 'components/interfaces/App/FeaturePreview/FeaturePreviewModal'
 import { MonacoThemeProvider } from 'components/interfaces/App/MonacoThemeProvider'
 import { GenerateSql } from 'components/interfaces/SqlGenerator/SqlGenerator'
-import { ErrorBoundaryState } from 'components/ui/ErrorBoundaryState'
+import { GlobalErrorBoundaryState } from 'components/ui/GlobalErrorBoundaryState'
 import { useRootQueryClient } from 'data/query-client'
 import { customFont, sourceCodePro } from 'fonts'
 import { AuthProvider } from 'lib/auth'
@@ -95,7 +95,7 @@ function CustomApp({ Component, pageProps }: AppPropsWithLayout) {
   const isTestEnv = process.env.NEXT_PUBLIC_NODE_ENV === 'test'
 
   return (
-    <ErrorBoundary FallbackComponent={ErrorBoundaryState} onError={errorBoundaryHandler}>
+    <ErrorBoundary FallbackComponent={GlobalErrorBoundaryState} onError={errorBoundaryHandler}>
       <QueryClientProvider client={queryClient}>
         <NuqsAdapter>
           <Hydrate state={pageProps.dehydratedState}>
diff --git a/apps/studio/pages/project/[ref]/index.tsx b/apps/studio/pages/project/[ref]/index.tsx
index 4cb8529816b..2f13073bbf0 100644
--- a/apps/studio/pages/project/[ref]/index.tsx
+++ b/apps/studio/pages/project/[ref]/index.tsx
@@ -23,6 +23,7 @@ import { useAppStateSnapshot } from 'state/app-state'
 import type { NextPageWithLayout } from 'types'
 import {
   Badge,
+  Button,
   cn,
   Tabs_Shadcn_,
   TabsContent_Shadcn_,
@@ -81,6 +82,13 @@ const Home: NextPageWithLayout = () => {
           <div className="flex flex-col md:flex-row md:items-center gap-6 justify-between w-full">
             <div className="flex flex-col md:flex-row md:items-center gap-3 w-full">
               <h1 className="text-3xl">{projectName}</h1>
+              <Button
+                onClick={() => {
+                  throw Error('lol')
+                }}
+              >
+                Click
+              </Button>
               {isOrioleDb && (
                 <Tooltip>
                   <TooltipTrigger asChild>