From 64ef42d1ec63fbed18af56c7d11bb3ad8810f17e Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Tue, 1 Sep 2020 12:02:20 -0600
Subject: [PATCH] Fix issue where defaultAppId redirect could fire outside home
 app

---
 src/plugins/home/public/application/application.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/plugins/home/public/application/application.tsx b/src/plugins/home/public/application/application.tsx
index 5d71bf8651d88..a4a158bc7dbde 100644
--- a/src/plugins/home/public/application/application.tsx
+++ b/src/plugins/home/public/application/application.tsx
@@ -47,6 +47,13 @@ export const renderApp = async (
 
   chrome.setBreadcrumbs([{ text: homeTitle }]);
 
+  // dispatch synthetic hash change event to update hash history objects
+  // this is necessary because hash updates triggered by using popState won't trigger this event naturally.
+  // This must be called before the app is mounted to avoid call this after the redirect to default app logic kicks in
+  const unlisten = history.listen((location) => {
+    window.dispatchEvent(new HashChangeEvent('hashchange'));
+  });
+
   render(
     <KibanaContextProvider services={{ ...coreStart }}>
       <HomeApp directories={directories} solutions={solutions} />
@@ -54,12 +61,6 @@ export const renderApp = async (
     element
   );
 
-  // dispatch synthetic hash change event to update hash history objects
-  // this is necessary because hash updates triggered by using popState won't trigger this event naturally.
-  const unlisten = history.listen(() => {
-    window.dispatchEvent(new HashChangeEvent('hashchange'));
-  });
-
   return () => {
     unmountComponentAtNode(element);
     unlisten();