diff --git a/rma/models/rma.py b/rma/models/rma.py
index d6d35a24..129ff210 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -895,15 +895,14 @@ class Rma(models.Model):
                 location_id=self.location_id.id,
                 picking_id=self.picking_id.id,
             )
-        return_wizard = (
-            self.env["stock.return.picking"]
-            .with_context(
-                active_id=self.picking_id.id,
+        stock_return_picking_form = Form(
+            self.env["stock.return.picking"].with_context(
                 active_ids=self.picking_id.ids,
+                active_id=self.picking_id.id,
+                active_model="stock.picking",
             )
-            .create(create_vals)
         )
-        return_wizard._onchange_picking_id()
+        return_wizard = stock_return_picking_form.save()
         return_wizard.product_return_moves.filtered(
             lambda r: r.move_id != self.move_id
         ).unlink()
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index d38cd3e1..ab0ca6da 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -571,15 +571,15 @@ class TestRma(SavepointCase):
     def test_rma_from_picking_return(self):
         # Create a return from a delivery picking
         origin_delivery = self._create_delivery()
-        return_wizard = (
-            self.env["stock.return.picking"]
-            .with_context(
-                active_id=origin_delivery.id,
+        stock_return_picking_form = Form(
+            self.env["stock.return.picking"].with_context(
                 active_ids=origin_delivery.ids,
+                active_id=origin_delivery.id,
+                active_model="stock.picking",
             )
-            .create({"create_rma": True, "picking_id": origin_delivery.id})
         )
-        return_wizard._onchange_picking_id()
+        stock_return_picking_form.create_rma = True
+        return_wizard = stock_return_picking_form.save()
         picking_action = return_wizard.create_returns()
         # Each origin move is linked to a different RMA
         origin_moves = origin_delivery.move_lines