diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 46867c8bf23..161b061c18c 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -445,7 +445,7 @@
         </record>
 
         <act_window
-            context="{'search_default_account_id': [active_id], 'search_default_user_id': False}"
+            context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'act_window': True}"
             id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
             name="All Analytic Entries"
             res_model="account.analytic.line"
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 84124d94cf4..78a049436cb 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -229,8 +229,11 @@ class account_analytic_account(osv.osv):
             return self.name_get(cr, uid, project_ids, context=context)
         account = self.search(cr, uid, [('code', '=', name)]+args, limit=limit, context=context)
         if not account:
-            name = name.split('/ ')[-1]
-            account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args, limit=limit, context=context)
+            if context.get('act_window', False):
+                active_id = context.get('active_id')
+                account = self.search(cr, uid, [('id', '=', active_id)]+args, limit=limit, context=context)
+            else:
+                account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args, limit=limit, context=context)
             newacc = account
             while newacc:
                 newacc = self.search(cr, uid, [('parent_id', 'in', newacc)]+args, limit=limit, context=context)