diff --git a/web/__test__/components/Onboarding/OnboardingInternalBootStandalone.test.ts b/web/__test__/components/Onboarding/OnboardingInternalBootStandalone.test.ts
index d05237ed8d..246eb1cc36 100644
--- a/web/__test__/components/Onboarding/OnboardingInternalBootStandalone.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingInternalBootStandalone.test.ts
@@ -1,6 +1,6 @@
-import { flushPromises, mount } from '@vue/test-utils';
+import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils';
 
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import type {
   InternalBootApplyMessages,
@@ -11,6 +11,14 @@ import type {
 import OnboardingInternalBootStandalone from '~/components/Onboarding/standalone/OnboardingInternalBoot.standalone.vue';
 import { createTestI18n } from '../../utils/i18n';
 
+const INTERNAL_BOOT_HISTORY_STATE_KEY = '__unraidOnboardingInternalBoot';
+
+type InternalBootHistoryState = {
+  sessionId: string;
+  stepId: 'CONFIGURE_BOOT' | 'SUMMARY';
+  position: number;
+};
+
 const {
   draftStore,
   applyInternalBootSelectionMock,
@@ -129,10 +137,50 @@ const mountComponent = () =>
     },
   });
 
+enableAutoUnmount(afterEach);
+
+const getInternalBootHistoryState = (): InternalBootHistoryState | null => {
+  const state =
+    typeof window.history.state === 'object' && window.history.state !== null
+      ? (window.history.state as Record<string, unknown>)
+      : null;
+  const candidate = state?.[INTERNAL_BOOT_HISTORY_STATE_KEY];
+  if (!candidate || typeof candidate !== 'object') {
+    return null;
+  }
+
+  const sessionId =
+    typeof (candidate as Record<string, unknown>).sessionId === 'string'
+      ? (candidate as Record<string, unknown>).sessionId
+      : null;
+  const stepId =
+    (candidate as Record<string, unknown>).stepId === 'CONFIGURE_BOOT' ||
+    (candidate as Record<string, unknown>).stepId === 'SUMMARY'
+      ? ((candidate as Record<string, unknown>).stepId as InternalBootHistoryState['stepId'])
+      : null;
+  const position = Number((candidate as Record<string, unknown>).position);
+
+  if (!sessionId || !stepId || !Number.isInteger(position)) {
+    return null;
+  }
+
+  return {
+    sessionId,
+    stepId,
+    position,
+  };
+};
+
+const dispatchPopstate = (state: Record<string, unknown> | null) => {
+  window.history.replaceState(state, '', window.location.href);
+  window.dispatchEvent(new PopStateEvent('popstate', { state }));
+};
+
 describe('OnboardingInternalBoot.standalone.vue', () => {
   beforeEach(() => {
     vi.useFakeTimers();
     vi.clearAllMocks();
+    window.history.replaceState(null, '', window.location.href);
 
     draftStore.internalBootSelection = null;
     draftStore.internalBootApplySucceeded = false;
@@ -182,8 +230,9 @@ describe('OnboardingInternalBoot.standalone.vue', () => {
 
     expect(applyInternalBootSelectionMock).not.toHaveBeenCalled();
     expect(draftStore.setInternalBootApplySucceeded).toHaveBeenCalledWith(false);
-    expect(wrapper.text()).toContain('Setup Applied');
-    expect(wrapper.text()).toContain('No settings changed. Skipping configuration mutations.');
+    expect(wrapper.text()).toContain('No Updates Needed');
+    expect(wrapper.text()).toContain('No changes needed. Skipping configuration updates.');
+    expect(wrapper.find('[data-testid="internal-boot-standalone-edit-again"]').exists()).toBe(true);
     expect(stepperPropsRef.value).toMatchObject({
       activeStepIndex: 1,
     });
@@ -278,7 +327,69 @@ describe('OnboardingInternalBoot.standalone.vue', () => {
     expect(wrapper.find('[data-testid="internal-boot-step-stub"]').exists()).toBe(true);
   });
 
+  it('restores the configure step when browser back leaves a reversible result', async () => {
+    const wrapper = mountComponent();
+
+    await wrapper.get('[data-testid="internal-boot-step-complete"]').trigger('click');
+    await flushPromises();
+
+    const currentHistoryState = getInternalBootHistoryState();
+    expect(currentHistoryState).toMatchObject({
+      stepId: 'SUMMARY',
+      position: 1,
+    });
+
+    dispatchPopstate({
+      [INTERNAL_BOOT_HISTORY_STATE_KEY]: {
+        sessionId: currentHistoryState?.sessionId,
+        stepId: 'CONFIGURE_BOOT',
+        position: 0,
+      },
+    });
+    await flushPromises();
+    await wrapper.vm.$nextTick();
+
+    expect(stepperPropsRef.value).toMatchObject({
+      activeStepIndex: 0,
+    });
+    expect(wrapper.find('[data-testid="internal-boot-step-stub"]').exists()).toBe(true);
+  });
+
+  it('closes when browser back leaves a fully applied result', async () => {
+    draftStore.internalBootSelection = {
+      poolName: 'cache',
+      slotCount: 1,
+      devices: ['DISK-A'],
+      bootSizeMiB: 16384,
+      updateBios: true,
+    };
+
+    const wrapper = mountComponent();
+
+    await wrapper.get('[data-testid="internal-boot-step-complete"]').trigger('click');
+    await flushPromises();
+
+    const currentHistoryState = getInternalBootHistoryState();
+    expect(currentHistoryState).toMatchObject({
+      stepId: 'SUMMARY',
+      position: 1,
+    });
+
+    dispatchPopstate({
+      [INTERNAL_BOOT_HISTORY_STATE_KEY]: {
+        sessionId: currentHistoryState?.sessionId,
+        stepId: 'CONFIGURE_BOOT',
+        position: 0,
+      },
+    });
+    await flushPromises();
+
+    expect(cleanupOnboardingStorageMock).toHaveBeenCalledTimes(1);
+    expect(wrapper.find('[data-testid="dialog-stub"]').exists()).toBe(false);
+  });
+
   it('closes locally after showing a result', async () => {
+    const historyGoSpy = vi.spyOn(window.history, 'go').mockImplementation(() => {});
     const wrapper = mountComponent();
 
     await wrapper.get('[data-testid="internal-boot-step-complete"]').trigger('click');
@@ -287,24 +398,38 @@ describe('OnboardingInternalBoot.standalone.vue', () => {
     await wrapper.get('[data-testid="internal-boot-standalone-result-close"]').trigger('click');
     await flushPromises();
 
+    expect(historyGoSpy).toHaveBeenCalledWith(-2);
+    dispatchPopstate(null);
+    await flushPromises();
+
     expect(wrapper.find('[data-testid="internal-boot-standalone-result"]').exists()).toBe(false);
   });
 
   it('closes when the shared dialog requests dismissal', async () => {
+    const historyGoSpy = vi.spyOn(window.history, 'go').mockImplementation(() => {});
     const wrapper = mountComponent();
 
     await wrapper.get('[data-testid="dialog-dismiss"]').trigger('click');
     await flushPromises();
 
+    expect(historyGoSpy).toHaveBeenCalledWith(-1);
+    dispatchPopstate(null);
+    await flushPromises();
+
     expect(wrapper.find('[data-testid="dialog-stub"]').exists()).toBe(false);
   });
 
   it('closes via the top-right X button', async () => {
+    const historyGoSpy = vi.spyOn(window.history, 'go').mockImplementation(() => {});
     const wrapper = mountComponent();
 
     await wrapper.get('[data-testid="internal-boot-standalone-close"]').trigger('click');
     await flushPromises();
 
+    expect(historyGoSpy).toHaveBeenCalledWith(-1);
+    dispatchPopstate(null);
+    await flushPromises();
+
     expect(cleanupOnboardingStorageMock).toHaveBeenCalledTimes(1);
     expect(wrapper.find('[data-testid="dialog-stub"]').exists()).toBe(false);
   });
@@ -337,6 +462,7 @@ describe('OnboardingInternalBoot.standalone.vue', () => {
   });
 
   it('clears onboarding storage when closing after a successful result', async () => {
+    vi.spyOn(window.history, 'go').mockImplementation(() => {});
     const wrapper = mountComponent();
 
     await wrapper.get('[data-testid="internal-boot-step-complete"]').trigger('click');
@@ -347,6 +473,9 @@ describe('OnboardingInternalBoot.standalone.vue', () => {
     await wrapper.get('[data-testid="internal-boot-standalone-result-close"]').trigger('click');
     await flushPromises();
 
+    dispatchPopstate(null);
+    await flushPromises();
+
     expect(cleanupOnboardingStorageMock).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/web/__test__/components/Onboarding/OnboardingInternalBootStep.test.ts b/web/__test__/components/Onboarding/OnboardingInternalBootStep.test.ts
index 444df48b5d..1dc0268ee0 100644
--- a/web/__test__/components/Onboarding/OnboardingInternalBootStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingInternalBootStep.test.ts
@@ -341,15 +341,13 @@ describe('OnboardingInternalBootStep', () => {
     await flushPromises();
 
     expect(wrapper.find('[data-testid="brand-button"]').attributes('disabled')).toBeUndefined();
+    expect(wrapper.find('[data-testid="internal-boot-eligibility-panel"]').exists()).toBe(false);
     expect(wrapper.find('[data-testid="internal-boot-drive-warning"]').exists()).toBe(false);
     const selects = wrapper.findAll('select');
     await selects[1]?.setValue('ELIGIBLE-1');
     await flushPromises();
     expect(wrapper.find('[data-testid="internal-boot-drive-warning"]').exists()).toBe(true);
     expect(wrapper.text()).toContain('Selected drive warnings');
-    await wrapper.get('[data-testid="internal-boot-eligibility-toggle"]').trigger('click');
-    await flushPromises();
-    expect(wrapper.text()).toContain('HAS_INTERNAL_BOOT_PARTITIONS');
   });
 
   it('shows disk-level ineligibility while keeping the form available for eligible disks', async () => {
diff --git a/web/__test__/components/Onboarding/OnboardingModal.test.ts b/web/__test__/components/Onboarding/OnboardingModal.test.ts
index 3631e8a691..58bc196d34 100644
--- a/web/__test__/components/Onboarding/OnboardingModal.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingModal.test.ts
@@ -36,6 +36,7 @@ const {
   internalBootVisibilityLoading: { value: false },
   onboardingModalStoreState: {
     isVisible: { value: true },
+    sessionSource: { value: 'automatic' as 'automatic' | 'manual' },
     closeModal: vi.fn().mockResolvedValue(true),
   },
   activationCodeDataStore: {
@@ -112,15 +113,39 @@ vi.mock('~/components/Onboarding/OnboardingSteps.vue', () => ({
 
 vi.mock('~/components/Onboarding/stepRegistry', () => ({
   stepComponents: {
-    OVERVIEW: { template: '<div data-testid="overview-step" />' },
-    CONFIGURE_SETTINGS: { template: '<div data-testid="settings-step" />' },
-    CONFIGURE_BOOT: { template: '<div data-testid="internal-boot-step" />' },
-    ADD_PLUGINS: { template: '<div data-testid="plugins-step" />' },
-    ACTIVATE_LICENSE: { template: '<div data-testid="license-step" />' },
-    SUMMARY: { template: '<div data-testid="summary-step" />' },
+    OVERVIEW: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="overview-step"><button data-testid="overview-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="overview-step-back" @click="onBack()">back</button></div>',
+    },
+    CONFIGURE_SETTINGS: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="settings-step"><button data-testid="settings-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="settings-step-back" @click="onBack()">back</button></div>',
+    },
+    CONFIGURE_BOOT: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="internal-boot-step"><button data-testid="internal-boot-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="internal-boot-step-back" @click="onBack()">back</button></div>',
+    },
+    ADD_PLUGINS: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="plugins-step"><button data-testid="plugins-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="plugins-step-back" @click="onBack()">back</button></div>',
+    },
+    ACTIVATE_LICENSE: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="license-step"><button data-testid="license-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="license-step-back" @click="onBack()">back</button></div>',
+    },
+    SUMMARY: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="summary-step"><button data-testid="summary-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="summary-step-back" @click="onBack()">back</button></div>',
+    },
     NEXT_STEPS: {
-      props: ['onComplete'],
-      setup(props: { onComplete: () => void }) {
+      props: ['onComplete', 'onBack', 'showBack'],
+      setup(props: { onComplete: () => void; onBack?: () => void; showBack?: boolean }) {
         const handleClick = () => {
           cleanupOnboardingStorageMock();
           props.onComplete();
@@ -128,10 +153,11 @@ vi.mock('~/components/Onboarding/stepRegistry', () => ({
 
         return {
           handleClick,
+          props,
         };
       },
       template:
-        '<div data-testid="next-step"><button data-testid="next-step-complete" @click="handleClick">finish</button></div>',
+        '<div data-testid="next-step"><button data-testid="next-step-complete" @click="handleClick">finish</button><button v-if="props.showBack" data-testid="next-step-back" @click="props.onBack?.()">back</button></div>',
     },
   },
 }));
@@ -181,6 +207,7 @@ describe('OnboardingModal.vue', () => {
 
     onboardingModalStoreState.closeModal.mockImplementation(async () => {
       onboardingModalStoreState.isVisible.value = false;
+      onboardingModalStoreState.sessionSource.value = 'automatic';
       return true;
     });
 
@@ -189,6 +216,7 @@ describe('OnboardingModal.vue', () => {
     activationCodeDataStore.hasActivationCode = ref(true);
     activationCodeDataStore.registrationState = ref<string | null>('ENOKEYFILE');
     onboardingModalStoreState.isVisible.value = true;
+    onboardingModalStoreState.sessionSource.value = 'automatic';
     activationCodeDataStore.registrationState.value = 'ENOKEYFILE';
     onboardingStatusStore.isVersionDrift.value = false;
     onboardingStatusStore.completedAtVersion.value = null;
@@ -355,6 +383,26 @@ describe('OnboardingModal.vue', () => {
     expect(onboardingDraftStore.currentStepId.value).toBeNull();
   });
 
+  it('closes a manually opened wizard at the end instead of reloading the page', async () => {
+    onboardingModalStoreState.sessionSource.value = 'manual';
+    onboardingDraftStore.currentStepId.value = 'NEXT_STEPS';
+    const goSpy = vi.spyOn(window.history, 'go').mockImplementation(() => undefined);
+
+    const wrapper = mountComponent();
+    await flushPromises();
+
+    await wrapper.get('[data-testid="next-step-complete"]').trigger('click');
+    await flushPromises();
+
+    expect(goSpy).toHaveBeenCalledWith(-1);
+    expect(onboardingModalStoreState.closeModal).not.toHaveBeenCalled();
+
+    window.dispatchEvent(new PopStateEvent('popstate', { state: null }));
+    await flushPromises();
+
+    expect(onboardingModalStoreState.closeModal).toHaveBeenCalledTimes(1);
+  });
+
   it('shows a loading state while exit confirmation is closing the modal', async () => {
     let closeModalDeferred:
       | {
diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index 2a8050fe5f..13dcc2030f 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -380,7 +380,7 @@ describe('OnboardingSummaryStep', () => {
       assertExpected: (wrapper: ReturnType<typeof mountComponent>['wrapper']) => {
         expect(installPluginMock).not.toHaveBeenCalled();
         expect(wrapper.text()).toContain('Already installed');
-        expect(wrapper.text()).toContain('Setup Applied');
+        expect(wrapper.text()).toContain('No Updates Needed');
       },
     },
     {
@@ -392,7 +392,7 @@ describe('OnboardingSummaryStep', () => {
       assertExpected: (wrapper: ReturnType<typeof mountComponent>['wrapper']) => {
         expect(installPluginMock).not.toHaveBeenCalled();
         expect(wrapper.text()).toContain('Already installed');
-        expect(wrapper.text()).toContain('Setup Applied');
+        expect(wrapper.text()).toContain('No Updates Needed');
       },
     },
     {
@@ -402,7 +402,7 @@ describe('OnboardingSummaryStep', () => {
       },
       assertExpected: (wrapper: ReturnType<typeof mountComponent>['wrapper']) => {
         expect(installPluginMock).not.toHaveBeenCalled();
-        expect(wrapper.text()).toContain('Setup Applied');
+        expect(wrapper.text()).toContain('No Updates Needed');
       },
     },
     {
@@ -857,7 +857,7 @@ describe('OnboardingSummaryStep', () => {
       apply: () => {},
       assertExpected: (wrapper: ReturnType<typeof mountComponent>['wrapper']) => {
         expect(completeOnboardingMock).not.toHaveBeenCalled();
-        expect(wrapper.text()).toContain('Setup Applied');
+        expect(wrapper.text()).toContain('No Updates Needed');
         expect(wrapper.text()).not.toContain('Setup Saved in Best-Effort Mode');
       },
     },
@@ -889,7 +889,7 @@ describe('OnboardingSummaryStep', () => {
     expect(completeOnboardingMock).not.toHaveBeenCalled();
     expect(cleanupOnboardingStorageMock).not.toHaveBeenCalled();
     expect(wrapper.find('[data-testid="dialog"]').exists()).toBe(true);
-    expect(wrapper.text()).toContain('Setup Applied');
+    expect(wrapper.text()).toContain('No Updates Needed');
     expect(onComplete).not.toHaveBeenCalled();
   });
 
diff --git a/web/src/components/Onboarding/OnboardingModal.vue b/web/src/components/Onboarding/OnboardingModal.vue
index 7f26d15656..39a27b7d1f 100644
--- a/web/src/components/Onboarding/OnboardingModal.vue
+++ b/web/src/components/Onboarding/OnboardingModal.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, onMounted, ref, watchEffect } from 'vue';
+import { computed, nextTick, onMounted, onUnmounted, ref, watch, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 
@@ -25,9 +25,17 @@ import { useServerStore } from '~/store/server';
 import { useThemeStore } from '~/store/theme';
 
 const { t } = useI18n();
+const ONBOARDING_HISTORY_STATE_KEY = '__unraidOnboarding';
+
+type OnboardingHistoryState = {
+  sessionId: string;
+  stepId: StepId;
+  source: 'automatic' | 'manual';
+  position: number;
+};
 
 const onboardingModalStore = useOnboardingModalStore();
-const { isVisible } = storeToRefs(onboardingModalStore);
+const { isVisible, sessionSource } = storeToRefs(onboardingModalStore);
 const {
   activationRequired,
   hasActivationCode,
@@ -125,8 +133,72 @@ const showModal = computed(() => {
 
   return isVisible.value;
 });
+const isManualSession = computed(() => sessionSource.value === 'manual');
 const showExitConfirmDialog = ref(false);
 const isClosingModal = ref(false);
+const historySessionId = ref<string | null>(null);
+const historyPosition = ref(-1);
+const isApplyingHistoryState = ref(false);
+
+const createHistorySessionId = () =>
+  `onboarding-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+
+const getHistoryState = (state: unknown): OnboardingHistoryState | null => {
+  if (!state || typeof state !== 'object') {
+    return null;
+  }
+
+  const candidate = (state as Record<string, unknown>)[ONBOARDING_HISTORY_STATE_KEY];
+  if (!candidate || typeof candidate !== 'object') {
+    return null;
+  }
+
+  const sessionId =
+    typeof (candidate as Record<string, unknown>).sessionId === 'string'
+      ? (candidate as Record<string, unknown>).sessionId
+      : null;
+  const stepId =
+    typeof (candidate as Record<string, unknown>).stepId === 'string'
+      ? ((candidate as Record<string, unknown>).stepId as StepId)
+      : null;
+  const source = (candidate as Record<string, unknown>).source === 'manual' ? 'manual' : 'automatic';
+  const parsedPosition = Number((candidate as Record<string, unknown>).position);
+  const position = Number.isInteger(parsedPosition) ? parsedPosition : null;
+
+  if (!sessionId || !stepId || position === null) {
+    return null;
+  }
+
+  return {
+    sessionId,
+    stepId,
+    source,
+    position,
+  };
+};
+
+const buildHistoryState = (stepId: StepId, position: number) => {
+  const currentState =
+    typeof window.history.state === 'object' && window.history.state !== null
+      ? (window.history.state as Record<string, unknown>)
+      : {};
+
+  return {
+    ...currentState,
+    [ONBOARDING_HISTORY_STATE_KEY]: {
+      sessionId: historySessionId.value,
+      stepId,
+      source: sessionSource.value,
+      position,
+    } satisfies OnboardingHistoryState,
+  };
+};
+
+const clearHistorySession = () => {
+  historySessionId.value = null;
+  historyPosition.value = -1;
+  isApplyingHistoryState.value = false;
+};
 
 const getNearestVisibleStepId = (stepId: StepId): StepId | null => {
   const currentOrderIndex = STEP_ORDER.indexOf(stepId);
@@ -232,8 +304,14 @@ const docsButtons = computed<BrandButtonProps[]>(() => {
 });
 
 const closeModal = async (options?: { reload?: boolean }) => {
+  if (typeof window !== 'undefined' && isManualSession.value && historyPosition.value >= 0) {
+    window.history.go(-(historyPosition.value + 1));
+    return;
+  }
+
   await onboardingModalStore.closeModal();
   cleanupOnboardingStorage();
+  clearHistorySession();
 
   if (options?.reload) {
     window.location.reload();
@@ -258,7 +336,7 @@ const goToNextStep = async () => {
       setActiveStepByIndex(activeStepIndex + 1);
     } else {
       // If we're at the last step, close the modal
-      await closeModal({ reload: true });
+      await closeModal({ reload: !isManualSession.value });
     }
     return;
   }
@@ -267,6 +345,11 @@ const goToNextStep = async () => {
 };
 
 const goToPreviousStep = () => {
+  if (typeof window !== 'undefined' && historySessionId.value && historyPosition.value > 0) {
+    window.history.back();
+    return;
+  }
+
   if (currentDynamicStepIndex.value > 0) {
     setActiveStepByIndex(currentDynamicStepIndex.value - 1);
   }
@@ -279,6 +362,14 @@ const goToStep = (stepIndex: number) => {
     stepIndex < availableSteps.value.length &&
     stepIndex <= currentDynamicStepIndex.value
   ) {
+    if (typeof window !== 'undefined' && historySessionId.value) {
+      const delta = stepIndex - currentDynamicStepIndex.value;
+      if (delta < 0) {
+        window.history.go(delta);
+        return;
+      }
+    }
+
     setActiveStepByIndex(stepIndex);
   }
 };
@@ -351,10 +442,97 @@ const handleActivationSkip = async () => {
   if (currentDynamicStepIndex.value < availableSteps.value.length - 1) {
     setActiveStepByIndex(currentDynamicStepIndex.value + 1);
   } else {
-    await closeModal();
+    await closeModal({ reload: !isManualSession.value });
   }
 };
 
+const handlePopstate = async (event: PopStateEvent) => {
+  const nextHistoryState = getHistoryState(event.state);
+  const activeSessionId = historySessionId.value;
+
+  if (!activeSessionId) {
+    return;
+  }
+
+  if (nextHistoryState?.sessionId === activeSessionId) {
+    historyPosition.value = nextHistoryState.position;
+
+    if (
+      availableSteps.value.includes(nextHistoryState.stepId) &&
+      currentStepId.value !== nextHistoryState.stepId
+    ) {
+      isApplyingHistoryState.value = true;
+      draftStore.setCurrentStep(nextHistoryState.stepId);
+      await nextTick();
+      isApplyingHistoryState.value = false;
+    }
+    return;
+  }
+
+  if (!showModal.value || !isManualSession.value) {
+    return;
+  }
+
+  showExitConfirmDialog.value = false;
+  isClosingModal.value = true;
+  try {
+    await onboardingModalStore.closeModal();
+    cleanupOnboardingStorage();
+    clearHistorySession();
+  } finally {
+    isClosingModal.value = false;
+  }
+};
+
+watch(
+  () => [showModal.value, currentStep.value, sessionSource.value] as const,
+  ([visible, stepId]) => {
+    if (typeof window === 'undefined') {
+      return;
+    }
+
+    if (!visible || !stepId) {
+      if (!visible) {
+        clearHistorySession();
+      }
+      return;
+    }
+
+    if (isApplyingHistoryState.value) {
+      return;
+    }
+
+    const currentHistoryState = getHistoryState(window.history.state);
+    if (!historySessionId.value) {
+      historySessionId.value = createHistorySessionId();
+      historyPosition.value = 0;
+      const method = isManualSession.value ? 'pushState' : 'replaceState';
+      window.history[method](buildHistoryState(stepId, historyPosition.value), '', window.location.href);
+      return;
+    }
+
+    if (
+      currentHistoryState?.sessionId === historySessionId.value &&
+      currentHistoryState.stepId === stepId &&
+      currentHistoryState.position === historyPosition.value
+    ) {
+      return;
+    }
+
+    historyPosition.value += 1;
+    window.history.pushState(buildHistoryState(stepId, historyPosition.value), '', window.location.href);
+  },
+  { flush: 'post', immediate: true }
+);
+
+onMounted(() => {
+  window?.addEventListener('popstate', handlePopstate);
+});
+
+onUnmounted(() => {
+  window?.removeEventListener('popstate', handlePopstate);
+});
+
 const currentStepProps = computed<Record<string, unknown>>(() => {
   const step = currentStep.value;
   if (!step) {
@@ -429,7 +607,7 @@ const currentStepProps = computed<Record<string, unknown>>(() => {
     case 'NEXT_STEPS':
       return {
         ...baseProps,
-        onComplete: () => closeModal({ reload: true }),
+        onComplete: () => closeModal({ reload: !isManualSession.value }),
       };
 
     default:
diff --git a/web/src/components/Onboarding/standalone/OnboardingInternalBoot.standalone.vue b/web/src/components/Onboarding/standalone/OnboardingInternalBoot.standalone.vue
index 43ad82af89..d32c581ad8 100644
--- a/web/src/components/Onboarding/standalone/OnboardingInternalBoot.standalone.vue
+++ b/web/src/components/Onboarding/standalone/OnboardingInternalBoot.standalone.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import {
@@ -22,6 +22,13 @@ import type { StepId } from '@/components/Onboarding/stepRegistry';
 
 const { t } = useI18n();
 const draftStore = useOnboardingDraftStore();
+const INTERNAL_BOOT_HISTORY_STATE_KEY = '__unraidOnboardingInternalBoot';
+
+type InternalBootHistoryState = {
+  sessionId: string;
+  stepId: StepId;
+  position: number;
+};
 
 const currentStep = ref<StepId>('CONFIGURE_BOOT');
 const confirmationState = ref<'idle' | 'saving' | 'result'>('idle');
@@ -30,6 +37,9 @@ const logs = ref<LogEntry[]>([]);
 const resultTitle = ref('');
 const resultMessage = ref('');
 const resultSeverity = ref<'success' | 'warning' | 'error'>('success');
+const historySessionId = ref<string | null>(null);
+const historyPosition = ref(-1);
+const isApplyingHistoryState = ref(false);
 const standaloneSteps: Array<{ id: StepId; required: boolean }> = [
   { id: 'CONFIGURE_BOOT', required: true },
   { id: 'SUMMARY', required: true },
@@ -38,17 +48,73 @@ const standaloneSteps: Array<{ id: StepId; required: boolean }> = [
 const summaryT = (key: string, values?: Record<string, unknown>) =>
   t(`onboarding.summaryStep.${key}`, values ?? {});
 
+const canReturnToConfigure = () =>
+  confirmationState.value === 'result' &&
+  (resultSeverity.value !== 'success' || !draftStore.internalBootApplySucceeded);
+
 const showConsole = computed(() => confirmationState.value === 'saving' || logs.value.length > 0);
 const isSaving = computed(() => confirmationState.value === 'saving');
-const canEditAgain = computed(
-  () =>
-    currentStep.value === 'SUMMARY' &&
-    confirmationState.value === 'result' &&
-    resultSeverity.value !== 'success'
-);
+const canEditAgain = computed(() => currentStep.value === 'SUMMARY' && canReturnToConfigure());
 const currentStepIndex = computed(() =>
   standaloneSteps.findIndex((step) => step.id === currentStep.value)
 );
+const createHistorySessionId = () =>
+  `internal-boot-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+
+const getHistoryState = (state: unknown): InternalBootHistoryState | null => {
+  if (!state || typeof state !== 'object') {
+    return null;
+  }
+
+  const candidate = (state as Record<string, unknown>)[INTERNAL_BOOT_HISTORY_STATE_KEY];
+  if (!candidate || typeof candidate !== 'object') {
+    return null;
+  }
+
+  const sessionId =
+    typeof (candidate as Record<string, unknown>).sessionId === 'string'
+      ? (candidate as Record<string, unknown>).sessionId
+      : null;
+  const stepId =
+    (candidate as Record<string, unknown>).stepId === 'CONFIGURE_BOOT' ||
+    (candidate as Record<string, unknown>).stepId === 'SUMMARY'
+      ? ((candidate as Record<string, unknown>).stepId as StepId)
+      : null;
+  const parsedPosition = Number((candidate as Record<string, unknown>).position);
+  const position = Number.isInteger(parsedPosition) ? parsedPosition : null;
+
+  if (!sessionId || !stepId || position === null) {
+    return null;
+  }
+
+  return {
+    sessionId,
+    stepId,
+    position,
+  };
+};
+
+const buildHistoryState = (stepId: StepId, position: number) => {
+  const currentState =
+    typeof window.history.state === 'object' && window.history.state !== null
+      ? (window.history.state as Record<string, unknown>)
+      : {};
+
+  return {
+    ...currentState,
+    [INTERNAL_BOOT_HISTORY_STATE_KEY]: {
+      sessionId: historySessionId.value,
+      stepId,
+      position,
+    } satisfies InternalBootHistoryState,
+  };
+};
+
+const clearHistorySession = () => {
+  historySessionId.value = null;
+  historyPosition.value = -1;
+  isApplyingHistoryState.value = false;
+};
 
 const addLog = (entry: Omit<LogEntry, 'timestamp'>) => {
   logs.value.push({
@@ -83,9 +149,24 @@ const setResultFromApply = (applyResult: InternalBootApplyResult) => {
   resultMessage.value = summaryT('result.failedMessage');
 };
 
-const handleClose = () => {
+const closeLocally = () => {
   cleanupOnboardingStorage();
   isOpen.value = false;
+  clearHistorySession();
+};
+
+const handleClose = (options?: { fromHistory?: boolean }) => {
+  if (
+    typeof window !== 'undefined' &&
+    !options?.fromHistory &&
+    historySessionId.value &&
+    historyPosition.value >= 0
+  ) {
+    window.history.go(-(historyPosition.value + 1));
+    return;
+  }
+
+  closeLocally();
 };
 
 const handleEditAgain = () => {
@@ -109,8 +190,8 @@ const handleStepComplete = async () => {
       type: 'info',
     });
     resultSeverity.value = 'success';
-    resultTitle.value = summaryT('result.successTitle');
-    resultMessage.value = summaryT('result.successMessage');
+    resultTitle.value = summaryT('result.noChangesTitle');
+    resultMessage.value = summaryT('result.noChangesMessage');
     confirmationState.value = 'result';
     return;
   }
@@ -151,6 +232,90 @@ const handleStepComplete = async () => {
     clearInterval(progressTimer);
   }
 };
+
+const handlePopstate = (event: PopStateEvent) => {
+  const nextHistoryState = getHistoryState(event.state) ?? getHistoryState(window.history.state);
+  const activeSessionId = historySessionId.value;
+
+  if (!activeSessionId) {
+    return;
+  }
+
+  if (nextHistoryState?.sessionId === activeSessionId) {
+    historyPosition.value = nextHistoryState.position;
+
+    if (nextHistoryState.stepId === currentStep.value) {
+      return;
+    }
+
+    if (currentStep.value === 'SUMMARY' && confirmationState.value === 'saving') {
+      window.history.go(1);
+      return;
+    }
+
+    if (nextHistoryState.stepId === 'CONFIGURE_BOOT' && !canReturnToConfigure()) {
+      handleClose({ fromHistory: true });
+      return;
+    }
+
+    isApplyingHistoryState.value = true;
+    currentStep.value = nextHistoryState.stepId;
+    isApplyingHistoryState.value = false;
+    return;
+  }
+
+  handleClose({ fromHistory: true });
+};
+
+watch(
+  () => [isOpen.value, currentStep.value] as const,
+  ([open, stepId]) => {
+    if (typeof window === 'undefined') {
+      return;
+    }
+
+    if (!open) {
+      clearHistorySession();
+      return;
+    }
+
+    if (isApplyingHistoryState.value) {
+      return;
+    }
+
+    const currentHistoryState = getHistoryState(window.history.state);
+    if (!historySessionId.value) {
+      historySessionId.value = createHistorySessionId();
+      historyPosition.value = 0;
+      window.history.pushState(
+        buildHistoryState(stepId, historyPosition.value),
+        '',
+        window.location.href
+      );
+      return;
+    }
+
+    if (
+      currentHistoryState?.sessionId === historySessionId.value &&
+      currentHistoryState.stepId === stepId &&
+      currentHistoryState.position === historyPosition.value
+    ) {
+      return;
+    }
+
+    historyPosition.value += 1;
+    window.history.pushState(buildHistoryState(stepId, historyPosition.value), '', window.location.href);
+  },
+  { flush: 'post', immediate: true }
+);
+
+onMounted(() => {
+  window?.addEventListener('popstate', handlePopstate);
+});
+
+onUnmounted(() => {
+  window?.removeEventListener('popstate', handlePopstate);
+});
 </script>
 
 <template>
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 37a98417a9..9606fde0e3 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -292,10 +292,10 @@ const systemEligibilityCodes = computed<InternalBootSystemEligibilityCode[]>(()
 });
 const diskEligibilityIssues = computed(() =>
   allDeviceOptions.value
-    .filter((option) => option.ineligibilityCodes.length > 0 || option.warningCodes.length > 0)
+    .filter((option) => option.ineligibilityCodes.length > 0)
     .map((option) => ({
       label: option.label,
-      codes: [...option.ineligibilityCodes, ...option.warningCodes],
+      codes: [...option.ineligibilityCodes],
     }))
 );
 const selectedDriveWarnings = computed(() =>
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 64a37765e9..cab11c297b 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -696,7 +696,17 @@ const handleComplete = async () => {
       }
     };
 
-    if (!hasAnyChangesToApply.value) {
+    const pluginsToInstall = pluginIdsToInstall.value;
+    const hasUpdatesToApply =
+      shouldApplyTimeZone ||
+      shouldApplyServerIdentity ||
+      shouldApplyTheme ||
+      shouldApplyLocale ||
+      shouldApplySsh ||
+      pluginsToInstall.length > 0 ||
+      Boolean(internalBootSelection.value);
+
+    if (!hasUpdatesToApply) {
       addLog(summaryT('logs.noChanges'), 'info');
     }
 
@@ -860,7 +870,6 @@ const handleComplete = async () => {
       });
     }
 
-    const pluginsToInstall = pluginIdsToInstall.value;
     if (pluginsToInstall.length > 0) {
       addLog(summaryT('logs.installingPlugins', { count: pluginsToInstall.length }), 'info');
 
@@ -1015,6 +1024,10 @@ const handleComplete = async () => {
       applyResultSeverity.value = 'warning';
       applyResultTitle.value = summaryT('result.bestEffortTitle');
       applyResultMessage.value = summaryT('result.bestEffortMessage');
+    } else if (!hasUpdatesToApply) {
+      applyResultSeverity.value = 'success';
+      applyResultTitle.value = summaryT('result.noChangesTitle');
+      applyResultMessage.value = summaryT('result.noChangesMessage');
     } else {
       addLog(summaryT('logs.settingsApplied'), 'success');
       applyResultSeverity.value = 'success';
diff --git a/web/src/components/Onboarding/store/onboardingModalVisibility.ts b/web/src/components/Onboarding/store/onboardingModalVisibility.ts
index 30824e3c29..b26bd11dce 100644
--- a/web/src/components/Onboarding/store/onboardingModalVisibility.ts
+++ b/web/src/components/Onboarding/store/onboardingModalVisibility.ts
@@ -1,4 +1,4 @@
-import { computed, onMounted, onUnmounted } from 'vue';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { defineStore, storeToRefs } from 'pinia';
 import { useMutation } from '@vue/apollo-composable';
 
@@ -20,6 +20,8 @@ const ONBOARDING_URL_ACTION_OPEN = 'open';
 const ONBOARDING_BYPASS_SHORTCUT_CODE = 'KeyO';
 const ONBOARDING_FORCE_OPEN_EVENT = 'unraid:onboarding:open';
 
+export type OnboardingModalSessionSource = 'automatic' | 'manual';
+
 export const useOnboardingModalStore = defineStore('onboardingModalVisibility', () => {
   const onboardingStore = useOnboardingStore();
   const { shouldOpen, canDisplayOnboardingModal } = storeToRefs(onboardingStore);
@@ -29,6 +31,7 @@ export const useOnboardingModalStore = defineStore('onboardingModalVisibility',
   const { mutate: closeOnboardingMutation } = useMutation(CLOSE_ONBOARDING_MUTATION);
   const { mutate: bypassOnboardingMutation } = useMutation(BYPASS_ONBOARDING_MUTATION);
   const { mutate: resumeOnboardingMutation } = useMutation(RESUME_ONBOARDING_MUTATION);
+  const sessionSource = ref<OnboardingModalSessionSource>('automatic');
 
   const isVisible = computed(
     () => canDisplayOnboardingModal.value && shouldOpen.value && !callbackData.value
@@ -39,6 +42,7 @@ export const useOnboardingModalStore = defineStore('onboardingModalVisibility',
       return false;
     }
 
+    sessionSource.value = 'manual';
     await openOnboardingMutation();
     await refetchOnboarding();
     return true;
@@ -51,6 +55,7 @@ export const useOnboardingModalStore = defineStore('onboardingModalVisibility',
 
     await closeOnboardingMutation();
     await refetchOnboarding();
+    sessionSource.value = 'automatic';
     return true;
   };
 
@@ -63,6 +68,7 @@ export const useOnboardingModalStore = defineStore('onboardingModalVisibility',
   };
 
   const resumeOnboarding = async () => {
+    sessionSource.value = 'manual';
     await resumeOnboardingMutation();
     await refetchOnboarding();
   };
@@ -128,6 +134,7 @@ export const useOnboardingModalStore = defineStore('onboardingModalVisibility',
 
   return {
     isVisible,
+    sessionSource,
     forceOpenModal,
     closeModal,
     bypassOnboarding,
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index 92e5d8d0bc..ccb74780c6 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -267,7 +267,7 @@
   "onboarding.summaryStep.logs.baselineUnavailable": "Baseline settings unavailable. Continuing in best-effort mode.",
   "onboarding.summaryStep.logs.baselineFallback": "Baseline settings unavailable. Applying trusted defaults + draft values without diff checks.",
   "onboarding.summaryStep.logs.applyingPartnerCustomizations": "Applying partner customizations...",
-  "onboarding.summaryStep.logs.noChanges": "No settings changed. Skipping configuration mutations.",
+  "onboarding.summaryStep.logs.noChanges": "No changes needed. Skipping configuration updates.",
   "onboarding.summaryStep.logs.settingTimezone": "Setting TimeZone to {timeZone}...",
   "onboarding.summaryStep.logs.timezoneUpdated": "TimeZone updated.",
   "onboarding.summaryStep.logs.timezoneErrorContinue": "TimeZone request returned an error, continuing",
@@ -318,6 +318,8 @@
   "onboarding.summaryStep.result.warningsMessage": "Some settings could not be fully applied or verified. You can review and change any setting later from the Unraid Dashboard.",
   "onboarding.summaryStep.result.sshUnverifiedMessage": "Your SSH setting update was submitted, but final state could not be verified yet. You can verify and adjust it later from the Unraid Dashboard.",
   "onboarding.summaryStep.result.bestEffortMessage": "Your onboarding settings were applied. Some operations are best-effort and may take a moment to reflect. You can adjust settings later from the Unraid Dashboard.",
+  "onboarding.summaryStep.result.noChangesTitle": "No Updates Needed",
+  "onboarding.summaryStep.result.noChangesMessage": "There were no onboarding updates to apply, so nothing was changed.",
   "onboarding.summaryStep.result.successTitle": "Setup Applied",
   "onboarding.summaryStep.result.successMessage": "Your onboarding settings were applied successfully.",
   "onboarding.summaryStep.result.failedTitle": "Setup Failed",