Merge branch 'device-api-electron'

1 files changed, 11 insertions, 5 deletions

diff --git a/gui/src/renderer/components/KeyboardNavigation.tsx b/gui/src/renderer/components/KeyboardNavigation.tsx
index 4cfba89452..6b3851a49f 100644
--- a/gui/src/renderer/components/KeyboardNavigation.tsx
+++ b/gui/src/renderer/components/KeyboardNavigation.tsx
@@ -1,5 +1,7 @@
 import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import { useLocation } from 'react-router';
 import { useHistory } from '../lib/history';
+import { disableDismissForRoutes, RoutePath } from '../lib/routes';
 
 interface IKeyboardNavigationProps {
   children: React.ReactElement;
@@ -9,18 +11,22 @@ interface IKeyboardNavigationProps {
 export default function KeyboardNavigation(props: IKeyboardNavigationProps) {
   const history = useHistory();
   const [backAction, setBackAction] = useState<IBackActionConfiguration>();
+  const location = useLocation();
 
   const handleKeyDown = useCallback(
     (event: KeyboardEvent) => {
       if (event.key === 'Escape') {
-        if (event.shiftKey) {
-          history.dismiss(true);
-        } else {
-          backAction?.action();
+        const path = location.pathname as RoutePath;
+        if (!disableDismissForRoutes.includes(path)) {
+          if (event.shiftKey) {
+            history.dismiss(true);
+          } else {
+            backAction?.action();
+          }
         }
       }
     },
-    [history.dismiss, backAction],
+    [history.dismiss, backAction, location.pathname],
   );
 
   useEffect(() => {