diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f5e960dc0d4..7e115d3e258 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,6 +2,24 @@
 <openerp>
 <data>
 
+    <!-- Stage Search view -->
+    
+     <record id="crm_lead_stage_search" model="ir.ui.view">
+        <field name="name">Stage - Search</field>
+        <field name="model">crm.case.stage</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Stage Search">
+                <filter icon="terp-personal" name="lead"
+                    string="Lead" domain="[('type', '=', 'lead')]"/>
+                <filter icon="terp-personal+" name="opportunity"
+                    string="Opportunity" domain="[('type', '=', 'opportunity')]"/>
+                <separator orientation="vertical"/>
+                <field name="name"/>
+            </search>
+        </field>
+    </record>
+
     <!--Lead Stage Form view -->
 
     <record id="crm_lead_stage_act" model="ir.actions.act_window">
@@ -9,12 +27,10 @@
         <field name="res_model">crm.case.stage</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="domain">[('type', '=', 'lead')]</field>
-        <field name="context">{'type':'lead'}</field>
+        <field name="context">{'type':'lead','search_default_lead':1}</field>
+        <field name="search_view_id" ref="crm_lead_stage_search"/>
         <field name="help">Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.</field>
     </record>
-    
-   
 
      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
         groups="base.group_extended" sequence="0"
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index ee41e865b2d..3dbe0857939 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -2,22 +2,6 @@
 <openerp>
     <data>
     
-    <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
-        <field name="name">Stages</field>
-        <field name="res_model">crm.case.stage</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="domain">[('type', '=', 'opportunity')]</field>
-        <field name="context">{'type':'opportunity'}</field>
-        <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their sales opportunities. It will allow them to easily track how is positioned a specific opportunity in the sales cycle.</field>
-    </record>
-    
-
-
-     <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" name="Stages"
-        groups="base.group_extended" sequence="0"
-        parent="base.menu_crm_config_opportunity" />
-        
         <!-- Opportunities Form View -->
             <record model="ir.ui.view" id="crm_case_form_view_oppor">
                 <field name="name">Opportunities</field>