fix(settings): navigate back to origin page instead of always going home

Use sessionStorage to store the return URL when entering settings, and
use router.replace for tab switches so history doesn't accumulate.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx

@@ -2,7 +2,6 @@
 
 import { useCallback, useMemo } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
-import Link from 'next/link'
 import { useParams, usePathname, useRouter } from 'next/navigation'
 import { ChevronDown, Skeleton, Tooltip } from '@/components/emcn'
 import { useSession } from '@/lib/auth/auth-client'
@@ -23,6 +22,7 @@ import { useOrganizations } from '@/hooks/queries/organization'
 import { prefetchSubscriptionData, useSubscriptionData } from '@/hooks/queries/subscription'
 import { useSuperUserStatus } from '@/hooks/queries/user-profile'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
+import { useSettingsNavigation } from '@/hooks/use-settings-navigation'
 
 interface SettingsSidebarProps {
   isCollapsed?: boolean
@@ -167,9 +167,11 @@ export function SettingsSidebar({
     [queryClient, workspaceId]
   )
 
-  const handleBack = () => {
-    router.push(`/workspace/${workspaceId}/home`)
-  }
+  const { popSettingsReturnUrl, getSettingsHref } = useSettingsNavigation()
+
+  const handleBack = useCallback(() => {
+    router.push(popSettingsReturnUrl(`/workspace/${workspaceId}/home`))
+  }, [router, popSettingsReturnUrl, workspaceId])
 
   return (
     <>
@@ -256,14 +258,20 @@ export function SettingsSidebar({
                           {content}
                         </a>
                       ) : (
-                        <Link
-                          href={`/workspace/${workspaceId}/settings/${item.id}`}
+                        <button
+                          type='button'
                           className={itemClassName}
                           onMouseEnter={() => handlePrefetch(item.id)}
                           onFocus={() => handlePrefetch(item.id)}
+                          onClick={() =>
+                            router.replace(
+                              getSettingsHref({ section: item.id as SettingsSection }),
+                              { scroll: false }
+                            )
+                          }
                         >
                           {content}
-                        </Link>
+                        </button>
                       )
 
                       return (

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx

@@ -62,6 +62,7 @@ import {
 } from '@/app/workspace/[workspaceId]/w/hooks'
 import { useDeleteTask, useDeleteTasks, useRenameTask, useTasks } from '@/hooks/queries/tasks'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
+import { useSettingsNavigation } from '@/hooks/use-settings-navigation'
 import { SIDEBAR_WIDTH } from '@/stores/constants'
 import { useFolderStore } from '@/stores/folders/store'
 import { useSearchModalStore } from '@/stores/modals/search/store'
@@ -218,6 +219,7 @@ export const Sidebar = memo(function Sidebar() {
   const { data: sessionData, isPending: sessionLoading } = useSession()
   const { canEdit } = useUserPermissionsContext()
   const { config: permissionConfig, filterBlocks } = usePermissionConfig()
+  const { navigateToSettings } = useSettingsNavigation()
   const initializeSearchData = useSearchModalStore((state) => state.initializeData)
 
   useEffect(() => {
@@ -497,10 +499,10 @@ export const Sidebar = memo(function Sidebar() {
         id: 'settings',
         label: 'Settings',
         icon: Settings,
-        href: `/workspace/${workspaceId}/settings/general`,
+        onClick: () => navigateToSettings(),
       },
     ],
-    [workspaceId]
+    [workspaceId, navigateToSettings]
   )
 
   const { data: fetchedTasks = [], isLoading: tasksLoading } = useTasks(workspaceId)

apps/sim/hooks/use-settings-navigation.ts

@@ -4,6 +4,8 @@ import { useCallback } from 'react'
 import { useParams, useRouter } from 'next/navigation'
 import type { SettingsSection } from '@/app/workspace/[workspaceId]/settings/navigation'
 
+const SETTINGS_RETURN_URL_KEY = 'settings-return-url'
+
 interface SettingsNavigationOptions {
   section?: SettingsSection
   mcpServerId?: string
@@ -12,28 +14,51 @@ interface SettingsNavigationOptions {
 interface UseSettingsNavigationReturn {
   navigateToSettings: (options?: SettingsNavigationOptions) => void
   getSettingsHref: (options?: SettingsNavigationOptions) => string
+  popSettingsReturnUrl: (fallback: string) => string
 }
 
 export function useSettingsNavigation(): UseSettingsNavigationReturn {
   const router = useRouter()
   const params = useParams()
   const workspaceId = params.workspaceId as string
 
+  const settingsPrefix = `/workspace/${workspaceId}/settings/`
+
   const getSettingsHref = useCallback(
     (options?: SettingsNavigationOptions): string => {
       const section = options?.section || 'general'
       const searchParams = options?.mcpServerId ? `?mcpServerId=${options.mcpServerId}` : ''
-      return `/workspace/${workspaceId}/settings/${section}${searchParams}`
+      return `${settingsPrefix}${section}${searchParams}`
     },
-    [workspaceId]
+    [settingsPrefix]
   )
 
+  const popSettingsReturnUrl = useCallback((fallback: string): string => {
+    try {
+      const url = sessionStorage.getItem(SETTINGS_RETURN_URL_KEY)
+      sessionStorage.removeItem(SETTINGS_RETURN_URL_KEY)
+      return url ?? fallback
+    } catch {
+      return fallback
+    }
+  }, [])
+
   const navigateToSettings = useCallback(
     (options?: SettingsNavigationOptions) => {
-      router.push(getSettingsHref(options))
+      const currentPath = window.location.pathname
+      if (currentPath.startsWith(settingsPrefix)) {
+        router.replace(getSettingsHref(options), { scroll: false })
+      } else {
+        try {
+          sessionStorage.setItem(SETTINGS_RETURN_URL_KEY, currentPath)
+        } catch {
+          // Ignore storage errors
+        }
+        router.push(getSettingsHref(options))
+      }
     },
-    [router, getSettingsHref]
+    [router, settingsPrefix, getSettingsHref]
   )
 
-  return { navigateToSettings, getSettingsHref }
+  return { navigateToSettings, getSettingsHref, popSettingsReturnUrl }
 }