diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index bf0128dffd6..953d1aad0d4 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -310,10 +310,10 @@ class ir_values(osv.osv):
                              (SELECT company_id from res_users where id = %%s)
                           )
                       %s
-                   ORDER BY v.user_id, u.company_id"""
+                   ORDER BY v.user_id, u.company_id, v.key2"""
         params = ('default', model, uid, uid)
         if condition:
-            query %= 'AND v.key2 = %s'
+            query %= 'AND (v.key2 = %s OR v.key2 IS NULL)'
             params += (condition[:200],)
         else:
             query %= 'AND v.key2 is NULL'