diff --git a/src-web/components/App.tsx b/src-web/components/App.tsx
index a690dec3..4c0935b2 100644
--- a/src-web/components/App.tsx
+++ b/src-web/components/App.tsx
@@ -8,6 +8,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import { HelmetProvider } from 'react-helmet-async';
 import { AppRouter } from './AppRouter';
 import { DialogProvider } from './DialogContext';
+import { TauriListeners } from './TauriListeners';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -41,6 +42,7 @@ export function App() {
             <DialogProvider>
               <Suspense>
                 <AppRouter />
+                <TauriListeners />
                 {/*<ReactQueryDevtools initialIsOpen={false} />*/}
               </Suspense>
             </DialogProvider>
diff --git a/src-web/components/AppRouter.tsx b/src-web/components/AppRouter.tsx
index 871aa071..3087a956 100644
--- a/src-web/components/AppRouter.tsx
+++ b/src-web/components/AppRouter.tsx
@@ -7,7 +7,6 @@ import {
   useLocation,
 } from 'react-router-dom';
 import { routePaths } from '../hooks/useRoutes';
-import { useTauriListeners } from '../hooks/useTauriListeners';
 import { setLastLocation } from '../lib/lastLocation';
 import RouteError from './RouteError';
 import Workspace from './Workspace';
@@ -43,7 +42,6 @@ const router = createBrowserRouter([
 ]);
 
 export function AppRouter() {
-  useTauriListeners();
   return <RouterProvider router={router} />;
 }
 
diff --git a/src-web/components/TauriListeners.tsx b/src-web/components/TauriListeners.tsx
new file mode 100644
index 00000000..9175c941
--- /dev/null
+++ b/src-web/components/TauriListeners.tsx
@@ -0,0 +1,6 @@
+import { useTauriListeners } from '../hooks/useTauriListeners';
+
+export function TauriListeners() {
+  useTauriListeners();
+  return <></>;
+}