diff --git a/platform/ui-next/src/components/Button/Button.tsx b/platform/ui-next/src/components/Button/Button.tsx
index e8ae3d01f..106ad106f 100644
--- a/platform/ui-next/src/components/Button/Button.tsx
+++ b/platform/ui-next/src/components/Button/Button.tsx
@@ -39,13 +39,13 @@ export interface ButtonProps
 }
 
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant, size, asChild = false, ...props }, forwardRef) => {
+  ({ className, variant, size, asChild = false, dataCY, ...props }, forwardRef) => {
     const Comp = asChild ? Slot : 'button';
-    const dataCY = props.dataCY || `${props.name}-btn`;
+    const testId = dataCY || `${props.name}-btn`;
 
     return (
       <Comp
-        data-cy={dataCY}
+        data-cy={testId}
         className={cn(buttonVariants({ variant, size }), className)}
         ref={forwardRef}
         {...props}
diff --git a/platform/ui-next/src/components/Errorboundary/ErrorBoundary.tsx b/platform/ui-next/src/components/Errorboundary/ErrorBoundary.tsx
index 56ef25342..67cf9db7c 100644
--- a/platform/ui-next/src/components/Errorboundary/ErrorBoundary.tsx
+++ b/platform/ui-next/src/components/Errorboundary/ErrorBoundary.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { ErrorBoundary as ReactErrorBoundary, FallbackProps } from 'react-error-boundary';
 import { useTranslation } from 'react-i18next';
-import { Dialog, DialogContent } from '../Dialog/Dialog';
+import { Dialog, DialogContent, DialogTitle } from '../Dialog/Dialog';
 import { ScrollArea } from '../ScrollArea/ScrollArea';
 import { Button } from '../Button/Button';
 import { useNotification } from '../../contextProviders';
@@ -181,6 +181,7 @@ const DefaultFallback = ({
       open={showDetails}
       onOpenChange={setShowDetails}
     >
+      <DialogTitle className="invisible">{errorTitle}</DialogTitle>
       <DialogContent
         className="bg-muted max-w-3xl overflow-hidden border-0 p-0"
         onInteractOutside={e => e.preventDefault()}
@@ -262,7 +263,6 @@ const ErrorBoundary = ({
     let errorTimeout: NodeJS.Timeout;
 
     const handleError = (event: ErrorEvent) => {
-      event.preventDefault();
       clearTimeout(errorTimeout);
       errorTimeout = setTimeout(() => {
         setError(event.error);