diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index c95cc596641..42955c9d665 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -702,7 +702,7 @@ class survey_request(osv.osv):
         'email': fields.char("E-mail", size=64),
         'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
         'response': fields.many2one('survey.response', 'Answer'),
-        'state': fields.selection([('draft','Draft'),('waiting_answer', 'Waiting Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
+        'state': fields.selection([('draft','Draft'),('cancel', 'Cancelled'),('waiting_answer', 'Waiting Answer'),('done', 'Done')], 'State', readonly=1)
     }
     _defaults = {
         'state': lambda * a: 'draft',
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 7ced238b9b2..24d57eef09d 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1058,18 +1058,24 @@
             <field name="model">survey.request</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey Request">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
+                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
+                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
+                    <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object" icon="gtk-cancel"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,waiting_answer"/>
+                </div>
+                </div>
+                <sheet string="Survey Request" layout="auto">
+                    <group class="oe_form_header">
                     <field name="date_deadline"/>
                     <field name="survey_id"/>
                     <field name="user_id" on_change="on_change_user(user_id)"/>
                      <field name="response" readonly="1"/>
-                    <group colspan="4" col="6">
-                     <field name="state"/>
-                        <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
-                        <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
-                        <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
-                        <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>