diff --git a/client/dive-common/components/BottomPanel.vue b/client/dive-common/components/BottomPanel.vue
index 9d6740791..e24f03c9d 100644
--- a/client/dive-common/components/BottomPanel.vue
+++ b/client/dive-common/components/BottomPanel.vue
@@ -4,8 +4,8 @@ import ControlsContainer from 'dive-common/components/ControlsContainer.vue';
 import TrackSettingsPanel from 'dive-common/components/TrackSettingsPanel.vue';
 import TrackListColumnSettings from 'dive-common/components/TrackListColumnSettings.vue';
 import TrackList from 'vue-media-annotator/components/Tracks/TrackList.vue';
-import FilterList from 'vue-media-annotator/components/FilterList.vue';
-import TypeSettingsPanel from 'dive-common/components/TypeSettingsPanel.vue';
+import FilterList from 'vue-media-annotator/components/Types/FilterList.vue';
+import TypeSettingsPanel from 'dive-common/components/Types/TypeSettingsPanel.vue';
 import ConfidenceFilter from 'dive-common/components/ConfidenceFilter.vue';
 import ConfidenceSubsection from 'dive-common/components/ConfidenceSubsection.vue';
 import AttributeSubsection from 'dive-common/components/Attributes/AttributesSubsection.vue';
diff --git a/client/dive-common/components/GroupSidebar.spec.ts b/client/dive-common/components/GroupSidebar.spec.ts
index 53d37c6dd..cdeb353a5 100644
--- a/client/dive-common/components/GroupSidebar.spec.ts
+++ b/client/dive-common/components/GroupSidebar.spec.ts
@@ -4,7 +4,7 @@ import {
 } from 'vue';
 import { shallowMount } from '@vue/test-utils';
 import { clientSettings } from 'dive-common/store/settings';
-import FilterList from 'vue-media-annotator/components/FilterList.vue';
+import FilterList from 'vue-media-annotator/components/Types/FilterList.vue';
 import GroupSidebar from './GroupSidebar.vue';
 
 const provideMocks = vi.hoisted(() => ({
diff --git a/client/dive-common/components/GroupSidebar.vue b/client/dive-common/components/GroupSidebar.vue
index da35496fd..ee21eda0a 100644
--- a/client/dive-common/components/GroupSidebar.vue
+++ b/client/dive-common/components/GroupSidebar.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
-import FilterList from 'vue-media-annotator/components/FilterList.vue';
+import FilterList from 'vue-media-annotator/components/Types/FilterList.vue';
 import GroupList from 'vue-media-annotator/components/GroupList.vue';
 
 import StackedVirtualSidebarContainer from 'dive-common/components/StackedVirtualSidebarContainer.vue';
diff --git a/client/dive-common/components/Sidebar.vue b/client/dive-common/components/Sidebar.vue
index ba8137378..458b40de1 100644
--- a/client/dive-common/components/Sidebar.vue
+++ b/client/dive-common/components/Sidebar.vue
@@ -21,7 +21,7 @@ import { clientSettings } from 'dive-common/store/settings';
 import ConfidenceFilter from 'dive-common/components/ConfidenceFilter.vue';
 import TrackDetailsPanel from 'dive-common/components/TrackDetailsPanel.vue';
 import TrackSettingsPanel from 'dive-common/components/TrackSettingsPanel.vue';
-import TypeSettingsPanel from 'dive-common/components/TypeSettingsPanel.vue';
+import TypeSettingsPanel from 'dive-common/components/Types/TypeSettingsPanel.vue';
 import StackedVirtualSidebarContainer from 'dive-common/components/StackedVirtualSidebarContainer.vue';
 import { usePrompt } from 'dive-common/vue-utilities/prompt-service';
 
diff --git a/client/dive-common/components/TrackDetailsPanel.vue b/client/dive-common/components/TrackDetailsPanel.vue
index 153848770..077563743 100644
--- a/client/dive-common/components/TrackDetailsPanel.vue
+++ b/client/dive-common/components/TrackDetailsPanel.vue
@@ -26,7 +26,7 @@ import { Attribute } from 'vue-media-annotator/use/AttributeTypes';
 import type Track from 'src/track';
 import TrackItem from 'vue-media-annotator/components/Tracks/TrackItem.vue';
 import TooltipBtn from 'vue-media-annotator/components/TooltipButton.vue';
-import TypePicker from 'vue-media-annotator/components/TypePicker.vue';
+import TypePicker from 'vue-media-annotator/components/Types/TypePicker.vue';
 import RangeEditor from 'vue-media-annotator/components/RangeEditor.vue';
 
 import AttributeInput from 'dive-common/components/Attributes/AttributeInput.vue';
diff --git a/client/dive-common/components/CategoryImportDialog.spec.ts b/client/dive-common/components/Types/CategoryImportDialog.spec.ts
similarity index 100%
rename from client/dive-common/components/CategoryImportDialog.spec.ts
rename to client/dive-common/components/Types/CategoryImportDialog.spec.ts
diff --git a/client/dive-common/components/CategoryImportDialog.vue b/client/dive-common/components/Types/CategoryImportDialog.vue
similarity index 99%
rename from client/dive-common/components/CategoryImportDialog.vue
rename to client/dive-common/components/Types/CategoryImportDialog.vue
index e3926c342..70e5ee464 100644
--- a/client/dive-common/components/CategoryImportDialog.vue
+++ b/client/dive-common/components/Types/CategoryImportDialog.vue
@@ -4,14 +4,14 @@ import {
 } from 'vue';
 import { useReadOnlyMode, useTrackFilters } from 'vue-media-annotator/provides';
 import { clientSettings } from 'dive-common/store/settings';
-import { CategoryImport, parseCategoryFile } from '../categoryImport';
+import { CategoryImport, parseCategoryFile } from '../../categoryImport';
 import WormsImport from './WormsImport.vue';
 import {
   flattenHierarchyForest, pruneHierarchyUpward, resolveTypeHierarchy,
-} from '../typeHierarchy';
+} from '../../typeHierarchy';
 import {
   groupSynonymRemaps, multiAcceptedNameWarnings, synonymRemapSummary, SynonymRemap, TaxonomySources,
-} from '../worms';
+} from '../../worms';
 
 function mergeSynonymRemaps(
   current: SynonymRemap[] | undefined,
diff --git a/client/dive-common/components/SavedStylesEditor.vue b/client/dive-common/components/Types/SavedStylesEditor.vue
similarity index 99%
rename from client/dive-common/components/SavedStylesEditor.vue
rename to client/dive-common/components/Types/SavedStylesEditor.vue
index 78e0af721..fc05e6824 100644
--- a/client/dive-common/components/SavedStylesEditor.vue
+++ b/client/dive-common/components/Types/SavedStylesEditor.vue
@@ -9,7 +9,7 @@ import type { GlobalStyleSettings } from 'dive-common/apispec';
 import { usePrompt } from 'dive-common/vue-utilities/prompt-service';
 import StyleManager from 'vue-media-annotator/StyleManager';
 import type { CustomStyle } from 'vue-media-annotator/StyleManager';
-import TypeEditor from 'vue-media-annotator/components/TypeEditor.vue';
+import TypeEditor from 'vue-media-annotator/components/Types/TypeEditor.vue';
 
 type StyleKind = 'type' | 'group';
 
diff --git a/client/dive-common/components/TypeSettingsPanel.spec.ts b/client/dive-common/components/Types/TypeSettingsPanel.spec.ts
similarity index 100%
rename from client/dive-common/components/TypeSettingsPanel.spec.ts
rename to client/dive-common/components/Types/TypeSettingsPanel.spec.ts
diff --git a/client/dive-common/components/TypeSettingsPanel.vue b/client/dive-common/components/Types/TypeSettingsPanel.vue
similarity index 100%
rename from client/dive-common/components/TypeSettingsPanel.vue
rename to client/dive-common/components/Types/TypeSettingsPanel.vue
diff --git a/client/dive-common/components/TypeThreshold.vue b/client/dive-common/components/Types/TypeThreshold.vue
similarity index 100%
rename from client/dive-common/components/TypeThreshold.vue
rename to client/dive-common/components/Types/TypeThreshold.vue
diff --git a/client/dive-common/components/WormsImport.spec.ts b/client/dive-common/components/Types/WormsImport.spec.ts
similarity index 96%
rename from client/dive-common/components/WormsImport.spec.ts
rename to client/dive-common/components/Types/WormsImport.spec.ts
index f78de2b36..49c197130 100644
--- a/client/dive-common/components/WormsImport.spec.ts
+++ b/client/dive-common/components/Types/WormsImport.spec.ts
@@ -1,11 +1,11 @@
 import { defineComponent, h, nextTick } from 'vue';
 import { shallowMount } from '@vue/test-utils';
-import { WormsRecord } from '../worms';
+import { WormsRecord } from '../../worms';
 import WormsImport from './WormsImport.vue';
 
 const api = vi.hoisted(() => ({ search: vi.fn(), children: vi.fn(), prepare: vi.fn() }));
-vi.mock('../worms', async (importOriginal) => ({
-  ...await importOriginal<typeof import('../worms')>(),
+vi.mock('../../worms', async (importOriginal) => ({
+  ...await importOriginal<typeof import('../../worms')>(),
   WormsClient: class {
     search = api.search;
 
diff --git a/client/dive-common/components/WormsImport.vue b/client/dive-common/components/Types/WormsImport.vue
similarity index 99%
rename from client/dive-common/components/WormsImport.vue
rename to client/dive-common/components/Types/WormsImport.vue
index b1255ebff..eade158f1 100644
--- a/client/dive-common/components/WormsImport.vue
+++ b/client/dive-common/components/Types/WormsImport.vue
@@ -4,7 +4,7 @@ import {
 } from 'vue';
 import {
   WormsClient, WormsRecord, WORMS_PAGE_SIZE, wormsLink,
-} from '../worms';
+} from '../../worms';
 
 export default defineComponent({
   name: 'WormsImport',
diff --git a/client/dive-common/components/UserSettingsDialog.vue b/client/dive-common/components/UserSettingsDialog.vue
index f2808b36d..93ca3e37e 100644
--- a/client/dive-common/components/UserSettingsDialog.vue
+++ b/client/dive-common/components/UserSettingsDialog.vue
@@ -3,7 +3,7 @@ import { defineComponent } from 'vue';
 import { clientSettings } from 'dive-common/store/settings';
 import isDesktopRuntime from 'dive-common/isDesktopRuntime';
 import type { GlobalStyleSettings } from 'dive-common/apispec';
-import SavedStylesEditor from './SavedStylesEditor.vue';
+import SavedStylesEditor from './Types/SavedStylesEditor.vue';
 
 export default defineComponent({
   name: 'UserSettingsDialog',
diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue
index 2417f7108..f09531a56 100644
--- a/client/dive-common/components/Viewer.vue
+++ b/client/dive-common/components/Viewer.vue
@@ -51,7 +51,7 @@ import SegmentationPointClick from 'dive-common/recipes/segmentationpointclick';
 import EditorMenu from 'dive-common/components/EditorMenu.vue';
 import ConfidenceFilter from 'dive-common/components/ConfidenceFilter.vue';
 import UserGuideButton from 'dive-common/components/UserGuideButton.vue';
-import TypeSettingsPanel from 'dive-common/components/TypeSettingsPanel.vue';
+import TypeSettingsPanel from 'dive-common/components/Types/TypeSettingsPanel.vue';
 import TrackSettingsPanel from 'dive-common/components/TrackSettingsPanel.vue';
 import TrackListColumnSettings from 'dive-common/components/TrackListColumnSettings.vue';
 import TrackDetailsPanel from 'dive-common/components/TrackDetailsPanel.vue';
diff --git a/client/dive-common/store/context.ts b/client/dive-common/store/context.ts
index f3ab38216..f2b805c74 100644
--- a/client/dive-common/store/context.ts
+++ b/client/dive-common/store/context.ts
@@ -1,6 +1,6 @@
 import { reactive, Component } from 'vue';
 /* Components */
-import TypeThreshold from 'dive-common/components/TypeThreshold.vue';
+import TypeThreshold from 'dive-common/components/Types/TypeThreshold.vue';
 import ImageEnhancements from 'vue-media-annotator/components/ImageEnhancements.vue';
 import GroupSidebar from 'dive-common/components/GroupSidebar.vue';
 import AttributesSideBar from 'dive-common/components/Attributes/AttributesSideBar.vue';
diff --git a/client/src/components/GroupItem.vue b/client/src/components/GroupItem.vue
index ce6f7d38c..fd08cef6c 100644
--- a/client/src/components/GroupItem.vue
+++ b/client/src/components/GroupItem.vue
@@ -5,7 +5,7 @@ import useVuetify from 'vue-media-annotator/use/useVuetify';
 import { useGroupFilterControls, useHandler, useReadOnlyMode } from '../provides';
 import Group from '../Group';
 
-import TypePicker from './TypePicker.vue';
+import TypePicker from './Types/TypePicker.vue';
 
 export default defineComponent({
   name: 'GroupItem',
diff --git a/client/src/components/Tracks/sidebar/SideBarTrackItemView.vue b/client/src/components/Tracks/sidebar/SideBarTrackItemView.vue
index 46a7d1571..4d8c91131 100644
--- a/client/src/components/Tracks/sidebar/SideBarTrackItemView.vue
+++ b/client/src/components/Tracks/sidebar/SideBarTrackItemView.vue
@@ -5,7 +5,7 @@ import {
 import context from 'dive-common/store/context';
 import type { TrackProjection } from 'vue-media-annotator/TrackProjection';
 import TooltipBtn from '../../TooltipButton.vue';
-import TypePicker from '../../TypePicker.vue';
+import TypePicker from '../../Types/TypePicker.vue';
 import {
   useCameraStore,
   useHandler,
diff --git a/client/src/components/FilterList.spec.ts b/client/src/components/Types/FilterList.spec.ts
similarity index 93%
rename from client/src/components/FilterList.spec.ts
rename to client/src/components/Types/FilterList.spec.ts
index 7d7edfe6e..df13b2036 100644
--- a/client/src/components/FilterList.spec.ts
+++ b/client/src/components/Types/FilterList.spec.ts
@@ -2,12 +2,14 @@ import {
   defineComponent, h, nextTick, ref, reactive,
 } from 'vue';
 import { shallowMount } from '@vue/test-utils';
+import { compileHierarchy } from 'dive-common/typeHierarchy';
 import { clientSettings } from 'dive-common/store/settings';
-import TrackFilterControls from '../TrackFilterControls';
-import Track, { Feature } from '../track';
-import BaseFilterControls from '../BaseFilterControls';
-import Group from '../Group';
-import CameraStore from '../CameraStore';
+import { typeListViewStore } from './typeListViewState';
+import TrackFilterControls from '../../TrackFilterControls';
+import Track, { Feature } from '../../track';
+import BaseFilterControls from '../../BaseFilterControls';
+import Group from '../../Group';
+import CameraStore from '../../CameraStore';
 import FilterList from './FilterList.vue';
 import TypeEditor from './TypeEditor.vue';
 
@@ -56,7 +58,7 @@ function mountFilterList(props: Record<string, unknown>) {
   return { wrapper, vm: child, setProps };
 }
 
-vi.mock('../provides', () => ({
+vi.mock('../../provides', () => ({
   useCameraStore: () => {
     const camMap = ref(new Map([['singleCam', {
       trackStore: {
@@ -182,6 +184,7 @@ function makeCountHierarchyFixture({
 }
 
 describe('FilterList hierarchy members', () => {
+  beforeEach(() => typeListViewStore.clear());
   beforeEach(() => {
     provideMocks.seekFrame.mockReset();
     provideMocks.intervalSearch.mockReset().mockReturnValue([]);
@@ -193,6 +196,45 @@ describe('FilterList hierarchy members', () => {
     clientSettings.typeSettings.showFrameCount = true;
   });
 
+  it('restores expanded parents and collapsed branches before rendering a returning sequence', async () => {
+    const hierarchy = {
+      leaf: 'branch', sibling: 'branch', branch: 'parent', parent: 'root',
+    };
+    const firstFixture = makeHierarchyFixture(hierarchy);
+    const first = mountFilterList({ ...firstFixture, showEmptyTypes: true, height: 240 });
+    first.vm.toggleSharedLineage();
+    first.vm.toggleExpanded('branch');
+    first.wrapper.destroy();
+
+    const secondFixture = makeHierarchyFixture(hierarchy);
+    const second = mountFilterList({ ...secondFixture, showEmptyTypes: true, height: 240 });
+    // Assert immediately, before nextTick: no compact frame should be rendered.
+    expect(second.vm.compactSharedLineage).toBe(false);
+    expect(second.wrapper.text()).toContain('Compact Parents');
+    expect(second.wrapper.text()).not.toContain('Expand Parents');
+    expect(second.vm.virtualTypes.map(({ type }) => type)).toEqual(['root', 'parent', 'branch']);
+    secondFixture.filterControls.typeHierarchy.value = { ...hierarchy };
+    secondFixture.filterControls.hierarchyIndex.value = compileHierarchy(hierarchy);
+    await nextTick();
+    expect(second.vm.compactSharedLineage).toBe(false);
+    expect(second.vm.virtualTypes.map(({ type }) => type)).toEqual(['root', 'parent', 'branch']);
+    second.wrapper.destroy();
+  });
+
+  it('restores each dataset independently and does not overwrite its state during hydration', async () => {
+    const fixture = makeHierarchyFixture({ leaf: 'branch', branch: 'root' });
+    const { wrapper, vm } = mountFilterList({ ...fixture, showEmptyTypes: true, height: 240 });
+    vm.toggleSharedLineage();
+    if (!provideMocks.datasetIdRef) throw new Error('No dataset ID');
+    provideMocks.datasetIdRef.value = 'dataset-b';
+    expect(vm.compactSharedLineage).toBe(true);
+    provideMocks.datasetIdRef.value = 'dataset-a';
+    expect(vm.compactSharedLineage).toBe(false);
+    await nextTick();
+    expect(vm.compactSharedLineage).toBe(false);
+    wrapper.destroy();
+  });
+
   it('discards an open Type Editor draft when the dataset changes', async () => {
     const { filterControls, styleManager } = makeHierarchyFixture();
     const { vm, wrapper } = mountFilterList({
@@ -506,7 +548,7 @@ describe('FilterList hierarchy members', () => {
     expect(vm.virtualTypes.map(({ type }) => type)).toEqual(['root', 'branch', 'leaf']);
   });
 
-  it('resets collapsed branches when a dataset hierarchy is loaded', async () => {
+  it('preserves collapsed branches when the same dataset hierarchy reloads', async () => {
     clientSettings.typeSettings.trackSortDir = 'a-z';
     clientSettings.typeSettings.filterTypesByFrame = false;
     const { filterControls, styleManager } = makeHierarchyFixture();
@@ -527,7 +569,7 @@ describe('FilterList hierarchy members', () => {
     };
     await nextTick();
 
-    expect(vm.virtualTypes.map(({ type }) => type)).toEqual(['root', 'branch', 'leaf']);
+    expect(vm.virtualTypes.map(({ type }) => type)).toEqual(['root']);
   });
 
   it('keeps the header query-scoped while a context parent owns its full subtree', async () => {
diff --git a/client/src/components/FilterList.vue b/client/src/components/Types/FilterList.vue
similarity index 95%
rename from client/src/components/FilterList.vue
rename to client/src/components/Types/FilterList.vue
index a96602adf..2e6338cf1 100644
--- a/client/src/components/FilterList.vue
+++ b/client/src/components/Types/FilterList.vue
@@ -9,27 +9,29 @@ import {
 
 import { usePrompt } from 'dive-common/vue-utilities/prompt-service';
 import { clientSettings } from 'dive-common/store/settings';
+import { parentDatasetId } from 'dive-common/compositeDatasetId';
 import { compileHierarchy } from 'dive-common/typeHierarchy';
+import { typeListViewStore } from './typeListViewState';
 import {
   useCameraStore, useDatasetId, useHandler, useReadOnlyMode, useTime,
   usePendingSaveCount,
-} from '../provides';
-import TooltipBtn from './TooltipButton.vue';
+} from '../../provides';
+import TooltipBtn from '../TooltipButton.vue';
 import TypeEditor from './TypeEditor.vue';
 import TypeItem from './TypeItem.vue';
-import BaseFilterControls, { AnnotationWithContext } from '../BaseFilterControls';
-import TrackFilterControls from '../TrackFilterControls';
-import Track from '../track';
-import Group from '../Group';
-import StyleManager from '../StyleManager';
+import BaseFilterControls, { AnnotationWithContext } from '../../BaseFilterControls';
+import TrackFilterControls from '../../TrackFilterControls';
+import Track from '../../track';
+import Group from '../../Group';
+import StyleManager from '../../StyleManager';
 import {
   createRegionSuppressionTester, getSuppressedTrackIds, hasSuppressionAttribute,
   suppressionTypeResolver,
-} from '../use/suppression';
+} from '../../use/suppression';
 import {
   buildTypeListModel, countResolvedTypes, TypeListModel, TypeListRow,
   updateHierarchyCheckedTypes,
-} from '../typeListHierarchy';
+} from './typeListHierarchy';
 
 /* Row height shared by the type rows, the shared-lineage breadcrumb, and the
    scroller's height accounting. Mirrored by `$row-height` in the style block. */
@@ -143,20 +145,29 @@ export default defineComponent({
     const typeStylingRef = props.styleManager.typeStyling;
     const filteredTracksRef = trackFilters.filteredAnnotations;
     const confidenceFiltersRef = trackFilters.confidenceFilters;
-    const collapsedTypes: Ref<Set<string>> = ref(new Set<string>());
-    const compactSharedLineage = ref(true);
+    const viewKey = computed(() => (datasetId.value
+      ? JSON.stringify([parentDatasetId(datasetId.value), props.group ? 'groups' : 'tracks']) : ''));
+    const initialView = typeListViewStore.read(viewKey.value);
+    const collapsedTypes: Ref<Set<string>> = ref(new Set(initialView.collapsed));
+    const compactSharedLineage = ref(initialView.compact);
+    function saveView() {
+      typeListViewStore.write(viewKey.value, {
+        compact: compactSharedLineage.value, collapsed: [...collapsedTypes.value],
+      });
+    }
+    // Restore before a render, including when the dataset ID arrives before its
+    // hierarchy. Metadata hydration must not reset the user's presentation.
+    watch(viewKey, (key) => {
+      const saved = typeListViewStore.read(key);
+      collapsedTypes.value = new Set(saved.collapsed);
+      compactSharedLineage.value = saved.compact;
+    }, { flush: 'sync' });
     const hierarchyIndexRef = computed(() => (
       !props.group && trackFilters instanceof TrackFilterControls
         ? trackFilters.hierarchyIndex.value
         : undefined
     ));
     const hierarchyActive = computed(() => hierarchyIndexRef.value !== undefined);
-    if (trackFilters instanceof TrackFilterControls) {
-      watch(trackFilters.typeHierarchy, () => {
-        collapsedTypes.value = new Set<string>();
-        compactSharedLineage.value = true;
-      });
-    }
     watch(datasetId, () => {
       data.showPicker = false;
       data.selectedType = '';
@@ -457,10 +468,12 @@ export default defineComponent({
         next.add(type);
       }
       collapsedTypes.value = next;
+      saveView();
     }
 
     function toggleSharedLineage() {
       compactSharedLineage.value = !compactSharedLineage.value;
+      saveView();
     }
 
     const showSharedLineageControl = computed(() => (
diff --git a/client/src/components/ParentTypePicker.spec.ts b/client/src/components/Types/ParentTypePicker.spec.ts
similarity index 100%
rename from client/src/components/ParentTypePicker.spec.ts
rename to client/src/components/Types/ParentTypePicker.spec.ts
diff --git a/client/src/components/ParentTypePicker.vue b/client/src/components/Types/ParentTypePicker.vue
similarity index 100%
rename from client/src/components/ParentTypePicker.vue
rename to client/src/components/Types/ParentTypePicker.vue
diff --git a/client/src/components/TypeEditor.spec.ts b/client/src/components/Types/TypeEditor.spec.ts
similarity index 98%
rename from client/src/components/TypeEditor.spec.ts
rename to client/src/components/Types/TypeEditor.spec.ts
index 20b87609c..fafe53352 100644
--- a/client/src/components/TypeEditor.spec.ts
+++ b/client/src/components/Types/TypeEditor.spec.ts
@@ -3,8 +3,8 @@ import {
 } from 'vue';
 import { shallowMount } from '@vue/test-utils';
 import { TypeHierarchyError } from 'dive-common/typeHierarchy';
-import BaseFilterControls from '../BaseFilterControls';
-import TrackFilterControls from '../TrackFilterControls';
+import BaseFilterControls from '../../BaseFilterControls';
+import TrackFilterControls from '../../TrackFilterControls';
 import ParentTypePicker from './ParentTypePicker.vue';
 import TypeEditor from './TypeEditor.vue';
 
@@ -15,7 +15,7 @@ vi.mock('dive-common/vue-utilities/prompt-service', () => ({
   usePrompt: () => ({ prompt: promptMock }),
 }));
 
-vi.mock('../provides', () => ({
+vi.mock('../../provides', () => ({
   useReadOnlyMode: () => ref(provideMocks.readOnly),
 }));
 
diff --git a/client/src/components/TypeEditor.vue b/client/src/components/Types/TypeEditor.vue
similarity index 97%
rename from client/src/components/TypeEditor.vue
rename to client/src/components/Types/TypeEditor.vue
index 3486c1b93..19d03314c 100644
--- a/client/src/components/TypeEditor.vue
+++ b/client/src/components/Types/TypeEditor.vue
@@ -6,12 +6,12 @@ import {
 import { usePrompt } from 'dive-common/vue-utilities/prompt-service';
 import { TypeHierarchyError } from 'dive-common/typeHierarchy';
 
-import TrackFilterControls from '../TrackFilterControls';
-import BaseFilterControls from '../BaseFilterControls';
-import type Group from '../Group';
-import type StyleManager from '../StyleManager';
-import type Track from '../track';
-import { useReadOnlyMode } from '../provides';
+import TrackFilterControls from '../../TrackFilterControls';
+import BaseFilterControls from '../../BaseFilterControls';
+import type Group from '../../Group';
+import type StyleManager from '../../StyleManager';
+import type Track from '../../track';
+import { useReadOnlyMode } from '../../provides';
 import ParentTypePicker from './ParentTypePicker.vue';
 
 export default defineComponent({
diff --git a/client/src/components/TypeItem.spec.ts b/client/src/components/Types/TypeItem.spec.ts
similarity index 100%
rename from client/src/components/TypeItem.spec.ts
rename to client/src/components/Types/TypeItem.spec.ts
diff --git a/client/src/components/TypeItem.vue b/client/src/components/Types/TypeItem.vue
similarity index 99%
rename from client/src/components/TypeItem.vue
rename to client/src/components/Types/TypeItem.vue
index 2d7a6bce7..06aa5d64f 100644
--- a/client/src/components/TypeItem.vue
+++ b/client/src/components/Types/TypeItem.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue';
-import TooltipBtn from './TooltipButton.vue';
+import TooltipBtn from '../TooltipButton.vue';
 
 const INDENT_STEP_PX = 12;
 const TREE_PREFIX_PX = 20;
diff --git a/client/src/components/TypePicker.vue b/client/src/components/Types/TypePicker.vue
similarity index 100%
rename from client/src/components/TypePicker.vue
rename to client/src/components/Types/TypePicker.vue
diff --git a/client/src/typeListHierarchy.spec.ts b/client/src/components/Types/typeListHierarchy.spec.ts
similarity index 100%
rename from client/src/typeListHierarchy.spec.ts
rename to client/src/components/Types/typeListHierarchy.spec.ts
diff --git a/client/src/typeListHierarchy.ts b/client/src/components/Types/typeListHierarchy.ts
similarity index 100%
rename from client/src/typeListHierarchy.ts
rename to client/src/components/Types/typeListHierarchy.ts
diff --git a/client/src/components/Types/typeListViewState.spec.ts b/client/src/components/Types/typeListViewState.spec.ts
new file mode 100644
index 000000000..576e4b9b4
--- /dev/null
+++ b/client/src/components/Types/typeListViewState.spec.ts
@@ -0,0 +1,43 @@
+import { createTypeListViewStore } from './typeListViewState';
+
+function storage() {
+  let value: string | null = null;
+  return {
+    getItem: vi.fn(() => value),
+    setItem: vi.fn((_key: string, next: string) => { value = next; }),
+    removeItem: vi.fn(() => { value = null; }),
+  };
+}
+
+it('restores saved views across remounts/restarts without sharing mutable arrays', () => {
+  const disk = storage();
+  const store = createTypeListViewStore(disk);
+  const state = { compact: false, collapsed: ['fish'] };
+  store.write('dataset-a', state);
+  state.collapsed.push('shark');
+  const reopened = createTypeListViewStore(disk);
+  expect(reopened.read('dataset-a')).toEqual({ compact: false, collapsed: ['fish'] });
+  reopened.read('dataset-a').collapsed.push('salmon');
+  expect(reopened.read('dataset-a').collapsed).toEqual(['fish']);
+  expect(reopened.read('dataset-b')).toEqual({ compact: true, collapsed: [] });
+});
+
+it('retains navigation state when browser storage is blocked', () => {
+  const disk = storage();
+  disk.getItem.mockImplementation(() => { throw new Error('blocked'); });
+  disk.setItem.mockImplementation(() => { throw new Error('quota'); });
+  const store = createTypeListViewStore(disk);
+  store.write('a', { compact: false, collapsed: ['root'] });
+  expect(store.read('a')).toEqual({ compact: false, collapsed: ['root'] });
+});
+
+it('ignores malformed saved state and bounds retained datasets', () => {
+  const disk = storage();
+  disk.setItem('', '{broken');
+  const store = createTypeListViewStore(disk);
+  expect(store.read('a')).toEqual({ compact: true, collapsed: [] });
+  for (let i = 0; i < 110; i += 1) store.write(String(i), { compact: false, collapsed: [] });
+  const reopened = createTypeListViewStore(disk);
+  expect(reopened.read('0').compact).toBe(true);
+  expect(reopened.read('109').compact).toBe(false);
+});
diff --git a/client/src/components/Types/typeListViewState.ts b/client/src/components/Types/typeListViewState.ts
new file mode 100644
index 000000000..235230247
--- /dev/null
+++ b/client/src/components/Types/typeListViewState.ts
@@ -0,0 +1,58 @@
+/** Presentation only: never changes category definitions, selection, or thresholds. */
+export interface TypeListViewState {
+  compact: boolean;
+  collapsed: string[];
+}
+const STORAGE_KEY = 'dive.typeListViews.v1';
+const MAX_VIEWS = 100;
+type StorageLike = Pick<Storage, 'getItem' | 'setItem' | 'removeItem'>;
+
+function defaultView(): TypeListViewState { return { compact: true, collapsed: [] }; }
+function copy(view: TypeListViewState): TypeListViewState {
+  return { compact: view.compact, collapsed: [...view.collapsed] };
+}
+function browserStorage(): StorageLike | undefined {
+  try { return typeof localStorage === 'undefined' ? undefined : localStorage; } catch { return undefined; }
+}
+
+export function createTypeListViewStore(storage = browserStorage()) {
+  const views = new Map<string, TypeListViewState>();
+  let loaded = false;
+  function load() {
+    if (loaded) return;
+    loaded = true;
+    try {
+      const saved: unknown = JSON.parse(storage?.getItem(STORAGE_KEY) ?? '[]');
+      if (!Array.isArray(saved)) return;
+      saved.slice(-MAX_VIEWS).forEach((entry) => {
+        if (!Array.isArray(entry) || typeof entry[0] !== 'string') return;
+        const [key, view] = entry;
+        if (view && typeof view.compact === 'boolean' && Array.isArray(view.collapsed)
+          && view.collapsed.length <= 10000 && view.collapsed.every((name: unknown) => typeof name === 'string')) {
+          views.set(key, copy(view));
+        }
+      });
+    } catch { /* Storage unavailable or malformed: keep navigation state in memory. */ }
+  }
+  return {
+    read(key: string): TypeListViewState {
+      load();
+      return copy(views.get(key) ?? defaultView());
+    },
+    write(key: string, view: TypeListViewState) {
+      if (!key) return;
+      load();
+      views.delete(key);
+      views.set(key, copy(view));
+      if (views.size > MAX_VIEWS) views.delete(views.keys().next().value!);
+      try { storage?.setItem(STORAGE_KEY, JSON.stringify([...views])); } catch { /* Keep the memory copy. */ }
+    },
+    clear() {
+      loaded = true;
+      views.clear();
+      try { storage?.removeItem(STORAGE_KEY); } catch { /* Storage may be disabled. */ }
+    },
+  };
+}
+
+export const typeListViewStore = createTypeListViewStore();
diff --git a/client/src/components/index.ts b/client/src/components/index.ts
index 34a01d982..080228f93 100644
--- a/client/src/components/index.ts
+++ b/client/src/components/index.ts
@@ -13,7 +13,7 @@ import FileNameTimeDisplay from './controls/FileNameTimeDisplay.vue';
 import LineChart from './controls/LineChart.vue';
 import Timeline from './controls/Timeline.vue';
 
-import FilterList from './FilterList.vue';
+import FilterList from './Types/FilterList.vue';
 import GroupEditor from './GroupEditor.vue';
 import GroupList from './GroupList.vue';
 import GroupItem from './GroupItem.vue';
@@ -22,9 +22,9 @@ import LayerManager from './LayerManager.vue';
 import TooltipButton from './TooltipButton.vue';
 import TrackItem from './Tracks/TrackItem.vue';
 import TrackList from './Tracks/TrackList.vue';
-import TypeEditor from './TypeEditor.vue';
-import TypeItem from './TypeItem.vue';
-import TypePicker from './TypePicker.vue';
+import TypeEditor from './Types/TypeEditor.vue';
+import TypeItem from './Types/TypeItem.vue';
+import TypePicker from './Types/TypePicker.vue';
 
 export * from './annotators/useMediaController';
 export { default as useAnnotatorImageCursor } from './annotators/useAnnotatorImageCursor';
diff --git a/docs/UI-Type-List.md b/docs/UI-Type-List.md
index 43a47d359..976035765 100644
--- a/docs/UI-Type-List.md
+++ b/docs/UI-Type-List.md
@@ -135,6 +135,16 @@ Type settings also configure [suppression](UI-Suppression.md):
 
 The active suppression type shows an ==:material-eye-off:== icon in the type list. Detections may also be flagged with an attribute of the same name; see [Suppression](UI-Suppression.md) for region vs attribute behavior and display options.
 
+### Remembered hierarchy view
+
+The type list remembers **Expand Parents / Compact Parents** and each collapsed
+branch per sequence. Returning from Review or another page, changing between
+sidebar and bottom layouts, and reopening the application restores that view
+before the list renders. Reloading hierarchy metadata does not reset expansion.
+Other sequences keep their own view; category definitions, checked types, and
+confidence thresholds are unchanged. Preferences are saved locally for the most
+recent 100 sequences, with an in-memory fallback if browser storage is unavailable.
+
 ## Importing types from files
 
 Use **Type Settings → Types** to import COCO JSON or VIAME `.txt`, `.csv`, and