diff --git a/packages/client/src/components/Welcome/WelcomeModal.tsx b/packages/client/src/components/Welcome/WelcomeModal.tsx
index 6455288..561d933 100644
--- a/packages/client/src/components/Welcome/WelcomeModal.tsx
+++ b/packages/client/src/components/Welcome/WelcomeModal.tsx
@@ -26,7 +26,7 @@ export const WelcomeModal = () => {
   };
 
   return (
-    <Modal isOpen={isOpen} onClose={handleClose}>
+    <Modal isOpen={isOpen} onClose={handleClose} isDismissable={false}>
       <ModalContent>
         {(onClose) => (
           <>
diff --git a/packages/client/src/contexts/AppContext.tsx b/packages/client/src/contexts/AppContext.tsx
index e713447..48d6ff9 100644
--- a/packages/client/src/contexts/AppContext.tsx
+++ b/packages/client/src/contexts/AppContext.tsx
@@ -212,7 +212,7 @@ export const AppContext = ({ children }: PropsWithChildren) => {
       }}
     >
       {!config && (
-        <div className="fixed top-0 left-0 w-full h-full z-[9999] backdrop-blur-sm bg-black/30 text-white flex items-center justify-center">
+        <div className="fixed top-0 left-0 w-full h-full z-[49] backdrop-blur-sm bg-black/30 text-white flex items-center justify-center">
           <Spinner label="Loading..." />
         </div>
       )}