diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 050cd80d5e4..d131ecf693d 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from base_status.base_stage import base_stage
+from base_status.base_state import base_state
 from crm import crm
 from crm import wizard
 from osv import fields, osv
@@ -34,7 +34,7 @@ CRM_HELPDESK_STATES = (
 
 wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.helpdesk')
 
-class crm_helpdesk(base_stage, osv.osv):
+class crm_helpdesk(base_state, osv.osv):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 6adb91ebbbe..1dbc58ba047 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -30,21 +30,20 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_close" string="Close" type="object"
-                            states="open,pending"/>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
+                    <button name="case_close" string="Close" type="object"
+                            states="open,pending"/>
                     <button name="case_pending" string="Pending" type="object"
                             states="draft,open"/>
                     <button name="case_reset" string="Reset to Draft" type="object"
-                            states="done,cancel"/>
+                            states="cancel"/>
                     <button name="case_escalate" string="Escalate" type="object"
                             states="open,draft,pending"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
                     <div class="oe_right">
-                        <field name="stage_id" nolabel="1" widget="statusbar"
-                            on_change="onchange_stage_id(stage_id)"/>
+                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
                     <div class="oe_clear"/>
                 </div>
@@ -119,7 +118,6 @@
                                 <separator colspan="4" string="Misc"/>
                                 <field name="id" select="1"/>
                                 <field name="active"/>
-                                <field name="state" base="groups.base_no_one"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator colspan="4" string="Estimates"/>