diff --git a/addons/mrp/models/stock_move.py b/addons/mrp/models/stock_move.py
index 1eaa53799e1..b236c62652f 100644
--- a/addons/mrp/models/stock_move.py
+++ b/addons/mrp/models/stock_move.py
@@ -357,6 +357,7 @@ class StockMove(models.Model):
             action['views'] = [(self.env.ref('mrp.view_stock_move_operations_raw').id, 'form')]
             action['context']['show_destination_location'] = False
             action['context']['force_manual_consumption'] = True
+            action['context']['active_mo_id'] = self.raw_material_production_id.id
         elif self.production_id:
             action['views'] = [(self.env.ref('mrp.view_stock_move_operations_finished').id, 'form')]
             action['context']['show_source_location'] = False
diff --git a/addons/mrp/views/stock_move_views.xml b/addons/mrp/views/stock_move_views.xml
index c86cc44561e..ca508b99849 100644
--- a/addons/mrp/views/stock_move_views.xml
+++ b/addons/mrp/views/stock_move_views.xml
@@ -21,9 +21,6 @@
                 <xpath expr="//label[@for='quantity_done']" position="attributes">
 		    <attribute name="string">Consumed</attribute>
                 </xpath>
-                <xpath expr="//field[@name='quantity_done']" position='after'>
-                    <field name="raw_material_production_id" invisible="1"/>
-                </xpath>
             </field>
         </record>
 
@@ -50,7 +47,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='lot_id']" position="attributes">
 		            <attribute name="context">{
-                        'active_mo_id': parent.raw_material_production_id,
+                        'active_mo_id': context.get('active_mo_id'),
                         'active_picking_id': picking_id,
                         'default_company_id': parent.company_id,
                         'default_product_id': parent.product_id,