diff --git a/packages/stage-ui/src/components/scenarios/dialogs/onboarding/step-model-selection.vue b/packages/stage-ui/src/components/scenarios/dialogs/onboarding/step-model-selection.vue
index 96c1b4242..ee299ff15 100644
--- a/packages/stage-ui/src/components/scenarios/dialogs/onboarding/step-model-selection.vue
+++ b/packages/stage-ui/src/components/scenarios/dialogs/onboarding/step-model-selection.vue
@@ -3,6 +3,7 @@ import type { OnboardingStepNextHandler, OnboardingStepPrevHandler } from './typ
 
 import { Button } from '@proj-airi/ui'
 import { storeToRefs } from 'pinia'
+import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Alert from '../../../misc/alert.vue'
@@ -24,10 +25,22 @@ const {
   isLoadingActiveProviderModels,
   activeProviderModelError,
 } = storeToRefs(consciousnessStore)
+
+const sortedProviderModels = computed(() => {
+  return providerModels.value.toSorted((a, b) => {
+    if (a.id === activeModel.value)
+      return -1
+
+    if (b.id === activeModel.value)
+      return 1
+
+    return a.id.localeCompare(b.id)
+  })
+})
 </script>
 
 <template>
-  <div h-full flex flex-col gap-4>
+  <div h-full min-h-0 flex flex-col gap-4>
     <div sticky top-0 z-100 flex flex-shrink-0 items-center gap-2>
       <button outline-none @click="props.onPrevious">
         <div i-solar:alt-arrow-left-line-duotone h-5 w-5 />
@@ -39,7 +52,7 @@ const {
     </div>
 
     <!-- Using the new RadioCardManySelect component -->
-    <div flex flex-1 flex-col gap-4>
+    <div min-h-0 flex flex-1 flex-col gap-4>
       <Alert
         v-if="providerModels.length === 0 && !isLoadingActiveProviderModels"
         type="error"
@@ -54,41 +67,51 @@ const {
         </template>
       </Alert>
 
-      <RadioCardManySelect
-        v-model="activeModel"
-        v-model:search-query="modelSearchQuery"
-        :items="providerModels.toSorted((a, b) => a.id === activeModel ? -1 : b.id === activeModel ? 1 : 0)"
-        :searchable="true"
-        :allow-custom="true"
-        :search-placeholder="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.search_placeholder')"
-        :search-no-results-title="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.no_search_results')"
-        :search-no-results-description="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.no_search_results_description', { query: modelSearchQuery })"
-        :search-results-text="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.search_results', { count: '{count}', total: '{total}' })"
-        :custom-input-placeholder="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.custom_model_placeholder')"
-        :expand-button-text="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.expand')"
-        :collapse-button-text="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.collapse')"
-        list-class="max-h-[calc(100dvh-17rem)] sm:max-h-120 overflow-y-auto"
-      />
+      <div min-h-0 flex-1>
+        <RadioCardManySelect
+          v-model="activeModel"
+          v-model:search-query="modelSearchQuery"
+          :items="sortedProviderModels"
+          :searchable="true"
+          :allow-custom="true"
+          :search-placeholder="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.search_placeholder')"
+          :search-no-results-title="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.no_search_results')"
+          :search-no-results-description="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.no_search_results_description', { query: modelSearchQuery })"
+          :search-results-text="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.search_results', { count: '{count}', total: '{total}' })"
+          :custom-input-placeholder="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.custom_model_placeholder')"
+          :expand-button-text="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.expand')"
+          :collapse-button-text="t('settings.pages.modules.consciousness.sections.section.provider-model-selection.collapse')"
+          list-class="max-h-[calc(100dvh-20rem)] sm:max-h-100 overflow-y-auto"
+        />
 
-      <Alert v-if="activeProviderModelError" type="error">
-        <template #title>
-          {{ t('settings.dialogs.onboarding.validationFailed') }}
-        </template>
-        <template #content>
-          <div class="whitespace-pre-wrap break-all">
-            {{ activeProviderModelError }}
-          </div>
-        </template>
-      </Alert>
+        <Alert v-if="activeProviderModelError" type="error">
+          <template #title>
+            {{ t('settings.dialogs.onboarding.validationFailed') }}
+          </template>
+          <template #content>
+            <div class="whitespace-pre-wrap break-all">
+              {{ activeProviderModelError }}
+            </div>
+          </template>
+        </Alert>
+      </div>
     </div>
 
     <!-- Action Buttons -->
-    <Button
-      variant="primary"
-      :disabled="!activeModel"
-      :loading="isLoadingActiveProviderModels"
-      :label="t('settings.dialogs.onboarding.saveAndContinue')"
-      @click="props.onNext"
-    />
+    <div
+      :class="[
+        'sticky bottom-0 z-20 -mx-3 px-3 pt-3 pb-2',
+        'bg-gradient-to-t from-white via-white to-white/85',
+        'dark:from-[#0f0f0f] dark:via-[#0f0f0f] dark:to-[#0f0f0f]/85',
+      ]"
+    >
+      <Button
+        variant="primary"
+        :disabled="!activeModel"
+        :loading="isLoadingActiveProviderModels"
+        :label="t('settings.dialogs.onboarding.saveAndContinue')"
+        @click="props.onNext"
+      />
+    </div>
   </div>
 </template>