diff --git a/CHANGELOG b/CHANGELOG
index 88b07dafc3..ebadeb627f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Use the context to get the suffix of window name
 * Call on_change methods after setting default dtstart on calendar view
 * Allow to open in new tab Many2One and Reference with CTRL key
 * Store session in browser storage
diff --git a/src/action.js b/src/action.js
index 8a8f187e21..b5d8d26c46 100644
--- a/src/action.js
+++ b/src/action.js
@@ -17,7 +17,7 @@
         } else {
             data = jQuery.extend({}, data);
         }
-        function add_name_suffix(name){
+        function add_name_suffix(name, context){
             if (!data.model || !data.ids) {
                 return jQuery.when(name);
             }
@@ -96,7 +96,7 @@
                 params.icon = action['icon.rec_name'] || '';
 
                 if (action.keyword) {
-                    name_prm = add_name_suffix(action.name);
+                    name_prm = add_name_suffix(action.name, params.context);
                 }
                 name_prm.then(function(name) {
                     params.name = name;
@@ -110,7 +110,7 @@
                 params.window = action.window;
                 name_prm = jQuery.when(action.name);
                 if ((action.keyword || 'form_action') === 'form_action') {
-                    name_prm = add_name_suffix(action.name);
+                    name_prm = add_name_suffix(action.name, context);
                 }
                 name_prm.done(function(name) {
                     params.name = name;