diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 42b37b0726b..97e9c99f6d6 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -742,8 +742,8 @@
                             <field name="location_dest_id" domain="[('id', 'child_of', picking_destination_location_id)]"/>
                         </group>
                         <group string="Packages" groups="stock.group_tracking_lot">
-                            <field name="package_id" attrs="{'required': [('product_id', '=', False)]}" context="{'location_id': location_id}"/>
-                            <field name="result_package_id" context="{'location_id': location_dest_id}"/>
+                            <field name="package_id" attrs="{'required': [('product_id', '=', False)]}" domain="[('location_id', '=', location_id)]" context="{'location_id': location_id}"/>
+                            <field name="result_package_id" domain="[('location_id', '=', location_dest_id)]" context="{'location_id': location_dest_id}"/>
                         </group>
                     </group>
                 </form>
@@ -954,7 +954,7 @@
                             <field name="picking_type_entire_packs" invisible="1"/>
                             <field name="pack_operation_pack_ids" options="{'reload_on_button': True}" attrs="{'invisible': [('pack_operation_pack_ids', '=', []), ('picking_type_entire_packs', '=', False)]}" context="{'default_picking_id': id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id, 'default_picking_id': id}" groups="stock.group_tracking_lot">
                                 <tree editable="bottom" decoration-muted="qty_done&gt;0">
-                                    <field name="package_id" required="1" string="Package To Move"/>
+                                    <field name="package_id" required="1" string="Package To Move" domain="[('location_id', '=', location_id)]"/>
                                     <field name="location_id" domain="[('id', 'child_of', parent.location_id)]" invisible="1"/>
                                     <field name="from_loc" groups="stock.group_locations,stock.group_tracking_lot"/>
                                     <field name="to_loc" groups="stock.group_locations,stock.group_tracking_lot"/>