diff --git a/src/ui/component/header/view.jsx b/src/ui/component/header/view.jsx
index fefaa6400..ec4a9ccf8 100644
--- a/src/ui/component/header/view.jsx
+++ b/src/ui/component/header/view.jsx
@@ -41,8 +41,9 @@ const Header = (props: Props) => {
     signOut,
   } = props;
   const authenticated = Boolean(email);
-  const homeButtonNavigationProps = authHeader ? { onClick: signOut } : { navigate: '/' };
-  const closeButtonNavigationProps = authHeader ? { onClick: signOut } : { onClick: () => history.goBack() };
+  const authHeaderAction = authenticated ? { onClick: signOut } : { navigate: '/' };
+  const homeButtonNavigationProps = authHeader ? authHeaderAction : { navigate: '/' };
+  const closeButtonNavigationProps = authHeader ? authHeaderAction : { onClick: () => history.goBack() };
 
   function handleThemeToggle() {
     if (automaticDarkModeEnabled) {