diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index f6f5e8e53c..05feb0ff9c 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -63,7 +63,11 @@ class AppRouter {
         if (this.promiseShow) await this.promiseShow;
 
         this.promiseShow = new Promise((resolve) => {
-            this.resolveOnNextShow = resolve;
+            const unlisten = history.listen(() => {
+                unlisten();
+                this.promiseShow = null;
+                resolve();
+            });
             history.back();
         });