diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 30f5d5c9a61..2e332ef4542 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -91,15 +91,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Period">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
+                    <field name="name"/>
+                    <field name="code"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="fiscalyear_id"/>
                     <field name="special"/>
                     <separator colspan="4" string="States"/>
-                    <field name="state" select="1"/>
+                    <field name="state"/>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
                 </form>
             </field>
@@ -110,20 +110,40 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
               <tree colors="blue:state in ('draft');gray:state in ('done') " string="Period">
-                    <field name="code"/>
                     <field name="name"/>
+                    <field name="code"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                     <field name="special"/>
                     <field name="state"/>
+                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
+                    <button name="%(action_account_period_close)d" states="draft" string="Close Period" type="action" icon="gtk-convert"/>
                 </tree>
             </field>
         </record>
+        
+        <record id="view_account_period_search" model="ir.ui.view">
+            <field name="name">account.period.search</field>
+            <field name="model">account.period</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Period">
+                    <group>
+                        <filter string="Draft" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <separator orientation="vertical"/>
+                        <field name="code"/>
+                        <field name="name"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        
         <record id="action_account_period_form" model="ir.actions.act_window">
             <field name="name">Periods</field>
             <field name="res_model">account.period</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
+            <field name="context">{'search_default_draft': 1}</field>
         </record>
         <menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23"/>