diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 849d1b5064b..472e4852d4c 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -192,8 +192,15 @@ class act_window(osv.osv):
             return s
         for act in self.browse(cr, uid, ids):
             fields_from_fields_get = self.pool.get(act.res_model).fields_get(cr, uid)
+            search_view_id = False
             if act.search_view_id:
-                field_get = self.pool.get(act.res_model).fields_view_get(cr, uid, act.search_view_id.id, 'search', context)
+                search_view_id = act.search_view_id.id
+            else:
+                res_view = self.pool.get('ir.ui.view').search(cr, uid, [('model','=',act.res_model),('type','=','search'),('inherit_id','=',False)])
+                if res_view:
+                    search_view_id = res_view[0]
+            if search_view_id:
+                field_get = self.pool.get(act.res_model).fields_view_get(cr, uid, search_view_id, 'search', context)
                 fields_from_fields_get.update(field_get['fields'])
                 field_get['fields'] = fields_from_fields_get
                 res[act.id] = str(field_get)
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 3eb53ff2aa7..2bec4097a4f 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -335,7 +335,8 @@
                         <filter string="My Partners" icon="terp-partner" domain="[('parent_id','!=',False)]"/>
                         <separator orientation="vertical"/>
                         <filter string="Customers" icon="terp-partner" domain="[('customer','=',1)]" help="Customer Partners"/>
-                        <filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                        <filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners"
+                            default="context.get('default_supplier',False)"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="country" select="1"/>
@@ -376,7 +377,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="domain">[('customer','=',1)]</field>
+            <field name="domain">[]</field>
+            <field name="context">{'default_customer':1}</field>
             <field name="filter" eval="True"/>
         </record>
 
@@ -385,8 +387,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="domain">[('supplier','=',1)]</field>
-            <field name="context">{'default_customer':0}</field>
+            <field name="domain">[]</field>
+            <field name="context">{'default_customer':0, 'default_supplier':1}</field>
             <field name="filter" eval="True"/>
         </record>