diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 00a75dd60b1..bc0b6294727 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1186,6 +1186,7 @@ class stock_production_lot(osv.osv):
                 'name': 'Traceability',
                 'view_mode': 'tree,form',
                 'view_type': 'form',
+                'context': {'tree_view_ref': 'stock.view_move_tree'},
                 'res_model': 'stock.move',
                 'type': 'ir.actions.act_window',
                     }
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ff542762c38..7af0d7d0064 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -191,7 +191,7 @@
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
                     <div class="oe_button_box oe_right">
-                        <button name="action_traceability" string="Traceability" type="object"/>
+                        <button name="action_traceability" string="Traceability" type="object" attrs="{'invisible': [('quant_ids','=',[])]}"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>