diff --git a/src/routes/console/(migration-wizard)/step1.svelte b/src/routes/console/(migration-wizard)/step1.svelte
index d3a60aba6..56335467a 100644
--- a/src/routes/console/(migration-wizard)/step1.svelte
+++ b/src/routes/console/(migration-wizard)/step1.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { page } from '$app/stores';
-    import { InputSelect } from '$lib/elements/forms';
+    import { FormList, InputSelect } from '$lib/elements/forms';
     import InputText from '$lib/elements/forms/inputText.svelte';
     import { WizardStep } from '$lib/layout';
     import { Query, type Models, ID } from '@appwrite.io/console';
@@ -44,13 +44,12 @@
 <WizardStep {beforeSubmit}>
     <svelte:fragment slot="title">Project</svelte:fragment>
 
-    <div class="u-flex u-flex-vertical u-gap-24">
+    <FormList>
         {#if organizations.length > 1}
             <InputSelect
                 id="organization"
                 bind:value={selectedOrg}
                 label="Select organization"
-                wrapperTag="div"
                 options={organizations.map((p) => ({
                     label: p.name,
                     value: p.$id
@@ -94,7 +93,6 @@
                         id="project"
                         bind:value={$selectedProject}
                         label="Select a project"
-                        wrapperTag="div"
                         options={projects.map((p) => ({
                             label: p.name,
                             value: p.$id
@@ -109,7 +107,7 @@
                 {/if}
             </div>
         {/if}
-    </div>
+    </FormList>
 </WizardStep>
 
 <style lang="scss">