diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx
index 89baac915..8ea3e5312 100644
--- a/components/Modal/index.tsx
+++ b/components/Modal/index.tsx
@@ -121,7 +121,7 @@ export default function Modal({
         isOpen ? AnimationStateEnum.visible : AnimationStateEnum.hidden
       )
     }
-    if (typeof isOpen === "undefined") {
+    if (isOpen === undefined) {
       setAnimation(AnimationStateEnum.unmounted)
     }
   }, [isOpen])
diff --git a/components/Modal/modal.module.css b/components/Modal/modal.module.css
index 14ad542ad..120952cf8 100644
--- a/components/Modal/modal.module.css
+++ b/components/Modal/modal.module.css
@@ -23,6 +23,9 @@
   display: flex;
   flex-direction: column;
 
+  /* For removing focus outline when modal opens first time */
+  outline: 0 none;
+
   /* for supporting animations within content */
   position: relative;
   overflow: hidden;