diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d82e67fbf24..b6ba79e321c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -680,6 +680,7 @@ class stock_picking(osv.osv):
         if context is None:
             context = {}
         mod_obj = self.pool.get('ir.model.data')
+        # To get the right view of shipment based on type from stock move and Back order.
         if context.get('default_picking_id', False):
             picking_type = self.browse(cr, uid, context['default_picking_id'], context=context).type
             if picking_type == 'out':
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2aa6966f026..ab03d1c4606 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -698,7 +698,7 @@
                             <field name="invoice_state" string="Invoice Control" groups="base.group_extended"/>
                         </group>
                         <group colspan="2" col="2">
-                            <field name="backorder_id" readonly="1" groups="base.group_extended"/>
+                            <field name="backorder_id" context="{'default_picking_id':backorder_id}" readonly="1" groups="base.group_extended"/>
                             <field name="min_date" readonly="1"/>
                         </group>
                     </group>
@@ -891,7 +891,7 @@
                             
                         </group>
                         <group colspan="2" col="2">
-                            <field name="backorder_id" readonly="1" groups="base.group_extended"/>
+                            <field name="backorder_id" context="{'default_picking_id':backorder_id}" readonly="1" groups="base.group_extended"/>
                             <field name="min_date" readonly="1"/>
                             <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         </group>
@@ -1111,7 +1111,7 @@
                             
                         </group>
                         <group colspan="2" col="2">
-                            <field name="backorder_id" readonly="1" groups="base.group_extended"/>
+                            <field name="backorder_id" context="{'default_picking_id':backorder_id}" readonly="1" groups="base.group_extended"/>
                             <field name="min_date" readonly="1"/>
                             <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         </group>