diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
index ee7522c05a323..3ce48bd651934 100644
--- a/site/src/AppRouter.tsx
+++ b/site/src/AppRouter.tsx
@@ -337,7 +337,6 @@ export const AppRouter: FC = () => {
               <Route path=":workspace">
                 <Route index element={<WorkspacePage />} />
                 <Route path="schedule" element={<WorkspaceSchedulePage />} />
-                <Route path="terminal" element={<TerminalPage />} />
                 <Route
                   path="builds/:buildNumber"
                   element={<WorkspaceBuildPage />}
@@ -349,6 +348,12 @@ export const AppRouter: FC = () => {
               </Route>
             </Route>
           </Route>
+
+          <Route path="/@:username">
+            <Route path=":workspace">
+              <Route path="terminal" element={<TerminalPage />} />
+            </Route>
+          </Route>
         </Route>
 
         {/* Using path="*"" means "match anything", so this route