diff --git a/src/App.tsx b/src/App.tsx
index bb3669f..a0fabb0 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,6 +1,6 @@
 import { Box, Paper, ThemeProvider, List, ListItem, ListItemButton, ListItemText, SwipeableDrawer, ListItemIcon, IconButton, AppBar, Toolbar, PaletteMode, createTheme, useMediaQuery, useTheme } from "@mui/material";
 import React, { Dispatch, ReactNode } from "react";
-import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom";
+import { BrowserRouter, Routes, Route, Navigate, useSearchParams } from "react-router-dom";
 import { ApiWrapper, getDesignTokens,  GlobalUserInfo } from "./common";
 import { LoginPage } from "./login";
 import ServersBoard from "./servers";
@@ -14,6 +14,7 @@ import { SignupPage } from "./signup";
 import Brightness4Icon from '@mui/icons-material/Brightness4';
 import Brightness7Icon from '@mui/icons-material/Brightness7';
 import Cookies from 'js-cookie'
+import TerminalComponent from "./terminal";
 
 const ColorModeContext = React.createContext({ toggleColorMode: () => { } });
 
@@ -112,6 +113,7 @@ export default function App() {
     }),
     [],
   );
+  const [searchParams, setSearchParams] = useSearchParams();
 
   const theme = React.useMemo(() => createTheme(getDesignTokens(mode)), [mode]);
 
@@ -129,6 +131,7 @@ export default function App() {
                     <Route path='servers' element={<ServersBoard />} />
                     <Route path='users' element={<UsersPage />} />
                     <Route path='browsers' element={<BrowsersPage />} />
+                    <Route path='terminal' element={<TerminalComponent websocket={searchParams.get('ws')} />} />
                     <Route index element={<Navigate to='/servers' />} />
                   </Routes>
                 </Menu>
diff --git a/src/common.tsx b/src/common.tsx
index 31f73e4..3c71fba 100644
--- a/src/common.tsx
+++ b/src/common.tsx
@@ -265,7 +265,7 @@ export function ActionItem(p: { action: ActionInfo, identifierSubstring?: string
     }
 
     function createTerminalWindow(websocket: string){
-        window.open(`/terminal.html?ws=${encodeURIComponent(websocket)}`, 'Terminal', 'width=800,height=600');
+        window.open(`/terminal?ws=${encodeURIComponent(websocket)}`, 'Terminal', 'width=800,height=600');
     }
 
     return (<>