diff --git a/addons/stock_picking_batch/wizard/stock_add_to_wave.py b/addons/stock_picking_batch/wizard/stock_add_to_wave.py
index 6d715d45136..c09755ab0ca 100644
--- a/addons/stock_picking_batch/wizard/stock_add_to_wave.py
+++ b/addons/stock_picking_batch/wizard/stock_add_to_wave.py
@@ -27,7 +27,7 @@ class StockPickingToWave(models.TransientModel):
             raise UserError(_("The selected transfers should belong to the same operation type"))
         return res
 
-    wave_id = fields.Many2one('stock.picking.batch', string='Wave Transfer', domain="[('is_wave', '=', True), ('state', '!=', 'done')]")
+    wave_id = fields.Many2one('stock.picking.batch', string='Wave Transfer', domain="[('is_wave', '=', True), ('state', 'in', ('draft', 'in_progress'))]")
     picking_ids = fields.Many2many('stock.picking')
     line_ids = fields.Many2many('stock.move.line')
     mode = fields.Selection([('existing', 'an existing wave transfer'), ('new', 'a new wave transfer')], default='existing')
diff --git a/addons/stock_picking_batch/wizard/stock_add_to_wave_views.xml b/addons/stock_picking_batch/wizard/stock_add_to_wave_views.xml
index cca65188886..9ad57fe21d5 100644
--- a/addons/stock_picking_batch/wizard/stock_add_to_wave_views.xml
+++ b/addons/stock_picking_batch/wizard/stock_add_to_wave_views.xml
@@ -10,8 +10,8 @@
                     <group>
                         <label for="mode" string="Add to"/>
                         <field name="mode" widget="radio" nolabel="1"/>
-                        <field name="wave_id" options="{'no_create_edit': True, 'no_open': True}" attrs="{'invisible': [('mode', '=', 'new')], 'required': [('mode', '=', 'existing')]}"/>
-                        <field name="user_id" options="{'no_create_edit': True}" attrs="{'invisible': [('mode', '=', 'existing')]}"/>
+                        <field name="wave_id" options="{'no_create': True, 'no_open': True}" attrs="{'invisible': [('mode', '=', 'new')], 'required': [('mode', '=', 'existing')]}"/>
+                        <field name="user_id" options="{'no_create': True}" attrs="{'invisible': [('mode', '=', 'existing')]}"/>
                     </group>
                 </group>
 
diff --git a/addons/stock_picking_batch/wizard/stock_picking_to_batch.py b/addons/stock_picking_batch/wizard/stock_picking_to_batch.py
index 37fb80f5759..9b261d73297 100644
--- a/addons/stock_picking_batch/wizard/stock_picking_to_batch.py
+++ b/addons/stock_picking_batch/wizard/stock_picking_to_batch.py
@@ -9,7 +9,7 @@ class StockPickingToBatch(models.TransientModel):
     _name = 'stock.picking.to.batch'
     _description = 'Batch Transfer Lines'
 
-    batch_id = fields.Many2one('stock.picking.batch', string='Batch Transfer', domain="[('state', '=', 'draft')]")
+    batch_id = fields.Many2one('stock.picking.batch', string='Batch Transfer', domain="[('is_wave', '=', False), ('state', 'in', ('draft', 'in_progress'))]")
     mode = fields.Selection([('existing', 'an existing batch transfer'), ('new', 'a new batch transfer')], default='new')
     user_id = fields.Many2one('res.users', string='Responsible')
     is_create_draft = fields.Boolean(string="Draft", help='When checked, create the batch in draft status')
diff --git a/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml b/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml
index 6aeb7ec3578..f4273e10949 100644
--- a/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml
+++ b/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml
@@ -11,8 +11,8 @@
                     <group>
                         <label for="mode" string="Add to"/>
                         <field name="mode" widget="radio" nolabel="1"/>
-                        <field name="batch_id" options="{'no_create_edit': True, 'no_open': True}" attrs="{'invisible': [('mode', '=', 'new')], 'required': [('mode', '=', 'existing')]}"/>
-                        <field name="user_id" options="{'no_create_edit': True}" attrs="{'invisible': [('mode', '=', 'existing')]}"/>
+                        <field name="batch_id" options="{'no_create': True, 'no_open': True}" attrs="{'invisible': [('mode', '=', 'new')], 'required': [('mode', '=', 'existing')]}"/>
+                        <field name="user_id" options="{'no_create': True}" attrs="{'invisible': [('mode', '=', 'existing')]}"/>
                         <field name="is_create_draft"  attrs="{'invisible': [('mode', '!=', 'new')]}"/>
                     </group>
                 </group>