diff --git a/apps/web/src/common/dialogcontroller.js b/apps/web/src/common/dialogcontroller.js
index e19b83478..fb424ef7d 100644
--- a/apps/web/src/common/dialogcontroller.js
+++ b/apps/web/src/common/dialogcontroller.js
@@ -607,7 +607,7 @@ export function showImportDialog() {
   ));
 }
 
-export function showMultifactorDialog(primaryMethod = undefined) {
+export function showMultifactorDialog(primaryMethod = "") {
   return showDialog((Dialogs, perform) => (
     <Dialogs.MultifactorDialog
       onClose={(res) => perform(res)}
diff --git a/apps/web/src/components/dialogs/dialog.js b/apps/web/src/components/dialogs/dialog.js
index e93d21678..58fb60538 100644
--- a/apps/web/src/components/dialogs/dialog.js
+++ b/apps/web/src/components/dialogs/dialog.js
@@ -133,7 +133,7 @@ function Dialog(props) {
                 {...props.positiveButton.props}
                 variant="dialog"
                 data-test-id="dialog-yes"
-                autoFocus
+                autoFocus={props.positiveButton.autoFocus}
                 disabled={props.positiveButton.disabled || false}
                 onClick={
                   !props.positiveButton.disabled
diff --git a/apps/web/src/index.js b/apps/web/src/index.js
index faaa9ea6b..f77980958 100644
--- a/apps/web/src/index.js
+++ b/apps/web/src/index.js
@@ -1,3 +1,4 @@
+import "notes-core/types";
 import { EVENTS } from "@notesnook/desktop/events";
 import { render } from "react-dom";
 import { AppEventManager } from "./common/app-events";
diff --git a/apps/web/src/theme/variants/button.js b/apps/web/src/theme/variants/button.js
index f45f69cee..155c61a06 100644
--- a/apps/web/src/theme/variants/button.js
+++ b/apps/web/src/theme/variants/button.js
@@ -36,11 +36,10 @@ class Default {
         filter: "brightness(98%)",
       },
       outline: "none",
-      ":focus:not(:active), :focus-within:not(:active), :focus-visible:not(:active)":
-        {
-          filter: "brightness(90%)",
-          bg: "bgSecondary",
-        },
+      ":focus-visible:not(:active)": {
+        filter: "brightness(90%)",
+        bg: "bgSecondary",
+      },
       ":disabled": {
         opacity: 0.5,
         cursor: "not-allowed",
diff --git a/apps/web/src/views/auth.tsx b/apps/web/src/views/auth.tsx
index 79c95e15b..22fa4d741 100644
--- a/apps/web/src/views/auth.tsx
+++ b/apps/web/src/views/auth.tsx
@@ -169,7 +169,7 @@ function Auth(props: AuthProps) {
                 alignSelf: "end",
                 alignItems: "center",
               }}
-              onClick={() => db.user.logout()}
+              onClick={() => db.user?.logout()}
               color="error"
             >
               <Logout size={16} sx={{ mr: 1 }} color="error" /> Logout