diff --git a/shopfloor_reception_mobile/static/src/scenario/reception.js b/shopfloor_reception_mobile/static/src/scenario/reception.js
index 135091ccb0..96448649c0 100644
--- a/shopfloor_reception_mobile/static/src/scenario/reception.js
+++ b/shopfloor_reception_mobile/static/src/scenario/reception.js
@@ -21,19 +21,6 @@ const Reception = {
                 v-on:found="on_scan"
                 :input_placeholder="search_input_placeholder"
             />
-            <date-picker-input
-                v-if="state_is('set_lot')"
-                :handler_to_update_date="get_expiration_date_from_lot"
-                v-on:date_picker_selected="state.on_date_picker_selected"
-            />
-            <template v-if="state_is('select_move')">
-                <item-detail-card
-                    :record="state.data.picking"
-                    :options="operation_options()"
-                    :card_color="utils.colors.color_for('screen_step_done')"
-                    :key="make_state_component_key(['reception-picking-item-detail', state.data.picking.id])"
-                />
-            </template>
             <template v-if="state_is('select_document')">
                 <manual-select
                     class="with-progress-bar"
@@ -41,14 +28,12 @@ const Reception = {
                     :options="manual_select_options_for_select_document(true)"
                     :key="make_state_component_key(['reception', 'manual-select-document'])"
                 />
-                <div v-if="state_is('select_document')">
-                    <div class="button-list button-vertical-list full">
-                        <v-row align="center">
-                            <v-col class="text-center" cols="12">
-                                <btn-action @click="state.on_manual_selection">Manual selection</btn-action>
-                            </v-col>
-                        </v-row>
-                    </div>
+                <div class="button-list button-vertical-list full">
+                    <v-row align="center">
+                        <v-col class="text-center" cols="12">
+                            <btn-action @click="state.on_manual_selection">Manual selection</btn-action>
+                        </v-col>
+                    </v-row>
                 </div>
             </template>
             <template v-if="state_is('manual_selection') && visible_pickings">
@@ -71,6 +56,12 @@ const Reception = {
                 </div>
             </template>
             <template v-if="state_is('select_move')">
+                <item-detail-card
+                    :record="state.data.picking"
+                    :options="operation_options()"
+                    :card_color="utils.colors.color_for('screen_step_done')"
+                    :key="make_state_component_key(['reception-picking-item-detail', state.data.picking.id])"
+                />
                 <manual-select
                     :card_color="utils.colors.color_for('screen_step_done')"
                     :records="ordered_moves"
@@ -100,6 +91,10 @@ const Reception = {
                 </div>
             </template>
             <template v-if="state_is('set_lot')">
+                <date-picker-input
+                    :handler_to_update_date="get_expiration_date_from_lot"
+                    v-on:date_picker_selected="state.on_date_picker_selected"
+                />
                 <item-detail-card
                     :record="line_being_handled"
                     :options="picking_detail_options_for_set_lot()"