diff --git a/packages/overlay/src/App.tsx b/packages/overlay/src/App.tsx
index a0b70fb52..aff7839f8 100644
--- a/packages/overlay/src/App.tsx
+++ b/packages/overlay/src/App.tsx
@@ -78,7 +78,7 @@ export default function App({
       spotlightEventTarget.removeEventListener('open', onOpen);
       spotlightEventTarget.removeEventListener('close', onClose);
     };
-  }, []);
+  }, [spotlightEventTarget]);
 
   useEffect(() => {
     if (!isOpen) {
@@ -87,7 +87,7 @@ export default function App({
     } else {
       document.body.style.overflow = 'hidden';
     }
-  }, [isOpen]);
+  }, [isOpen, spotlightEventTarget]);
 
   log('Integrations', integrationData);
 
diff --git a/packages/overlay/src/components/Debugger.tsx b/packages/overlay/src/components/Debugger.tsx
index c2c95a399..f796e12db 100644
--- a/packages/overlay/src/components/Debugger.tsx
+++ b/packages/overlay/src/components/Debugger.tsx
@@ -1,7 +1,6 @@
 import { ReactComponent as Logo } from '~/assets/glyph.svg';
 import { Integration, IntegrationData } from '~/integrations/integration';
 import classNames from '../lib/classNames';
-import useKeyPress from '../lib/useKeyPress';
 import Overview from './Overview';
 
 export default function Debugger({
@@ -18,9 +17,6 @@ export default function Debugger({
   integrationData: IntegrationData<unknown>;
   isOnline: boolean;
 }) {
-  useKeyPress('Escape', () => {
-    setOpen(false);
-  });
   return (
     <div
       className={classNames('fullscreen-blur', isOpen ? '' : '!hidden')}
diff --git a/packages/overlay/src/components/Overview.tsx b/packages/overlay/src/components/Overview.tsx
index b2e3d6293..743af62f5 100644
--- a/packages/overlay/src/components/Overview.tsx
+++ b/packages/overlay/src/components/Overview.tsx
@@ -2,7 +2,6 @@ import { createElement } from 'react';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import { Integration, IntegrationData } from '~/integrations/integration';
 import Tabs from './Tabs';
-
 export default function Overview({
   integrations,
   integrationData,
diff --git a/packages/overlay/src/components/Tabs.tsx b/packages/overlay/src/components/Tabs.tsx
index f987d39cb..62e272abe 100644
--- a/packages/overlay/src/components/Tabs.tsx
+++ b/packages/overlay/src/components/Tabs.tsx
@@ -1,6 +1,8 @@
-import { NavLink, useNavigate } from 'react-router-dom';
+import { NavLink, useLocation, useNavigate } from 'react-router-dom';
 import { type IntegrationTab } from '~/integrations/integration';
 import classNames from '../lib/classNames';
+import { getSpotlightEventTarget } from '../lib/eventTarget';
+import useKeyPress from '../lib/useKeyPress';
 
 export type Props = {
   /**
@@ -18,6 +20,17 @@ export type Props = {
 
 export default function Tabs({ tabs, nested }: Props) {
   const navigate = useNavigate();
+  const location = useLocation();
+  const spotlightEventTarget = getSpotlightEventTarget();
+
+  useKeyPress('Escape', () => {
+    if (location.pathname.split('/').length === 2) {
+      spotlightEventTarget.dispatchEvent(new CustomEvent('closed'));
+    } else {
+      navigate(-1);
+    }
+  });
+
   return (
     <div>
       <div className="sm:hidden">
@@ -50,6 +63,7 @@ export default function Tabs({ tabs, nested }: Props) {
             <NavLink
               to={`${nested ? '' : '/'}${tab.id}`}
               key={tab.id}
+              replace={true}
               className={({ isActive }) =>
                 classNames(
                   isActive