diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 3894eb7f318..999e4b29a29 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -188,7 +188,7 @@ class config(osv.osv):
     _description = "Google Drive templates config"
     
     def _list_all_models(self, cr, uid, context=None):
-        cr.execute("SELECT model, name from ir_model")
+        cr.execute("SELECT model, name from ir_model order by name")
         return cr.fetchall()
     
     def _resource_get(self, cr, uid, ids, name, arg, context=None):
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index a874d802c98..8e75577999d 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -25,7 +25,7 @@
                     <field name="model_id" on_change="onchange_model_id(model_id)"/>
                     <label for='filter_id'/>
                     <div>
-                        <field name='filter_id' context="{'default_user_id': False, 'default_model_id': model_id}" domain="[('user_id','=',False)]"/>
+                        <field name='filter_id' context="{'default_user_id': False, 'default_model_id': model_id, 'hide_user_field': True}" domain="[('user_id','=',False)]"/>
                         <p class="oe_grey">
 					To Create a new filter, go to the list of documents you want to attach a google document to and 
 					save the filter. Then come back to this view. The saved filter will be available in the field above.
@@ -84,6 +84,17 @@
         </field>
     </record>
 
+        <record id="inherited_ir_filters_view" model="ir.ui.view">
+        <field name="name">filters</field>
+        <field name="model">ir.filters</field>
+        <field name="inherit_id" ref="base.ir_filters_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='user_id']" position="replace">
+                <field name="user_id" invisible="context.get('hide_user_field', False)"/>
+            </xpath>
+        </field>
+    </record>
+
         <menuitem name='Google Drive configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
         <menuitem id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
     </data>