diff --git a/packages/desktop-client/src/components/LoggedInUser.js b/packages/desktop-client/src/components/LoggedInUser.js
index c4d115f936db75e798b7efe7b38b6f24d8325332..d3bae724a6e968e6d5d4a7d905fbae1f5bc1b8d0 100644
--- a/packages/desktop-client/src/components/LoggedInUser.js
+++ b/packages/desktop-client/src/components/LoggedInUser.js
@@ -37,7 +37,7 @@ function LoggedInUser({
 
   async function onChangePassword() {
     await closeBudget();
-    history.push('/change-password');
+    window.__history.push('/change-password');
   }
 
   function onMenuSelect(type) {
@@ -54,11 +54,12 @@ function LoggedInUser({
     }
   }
 
-  function onClick() {
+  async function onClick() {
     if (serverUrl) {
       setMenuOpen(true);
     } else {
-      history.push('/config-server');
+      await closeBudget();
+      window.__history.push('/config-server');
     }
   }