diff --git a/CHANGELOG b/CHANGELOG
index dac0c39d78..7b0034e443 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Allow keyword action for all models
 * Add sortable_values in tools
 * Remove default colors on graph and calendar
 * Add model, record and records attributes on Wizard
diff --git a/trytond/ir/action.py b/trytond/ir/action.py
index 823703b67f..96e8252dc0 100644
--- a/trytond/ir/action.py
+++ b/trytond/ir/action.py
@@ -204,7 +204,7 @@ class ActionKeyword(ModelSQL, ModelView):
     def models_get():
         pool = Pool()
         Model = pool.get('ir.model')
-        return [(m.model, m.name) for m in Model.search([])]
+        return [(None, '')] + [(m.model, m.name) for m in Model.search([])]
 
     @classmethod
     def delete(cls, keywords):
@@ -246,7 +246,10 @@ class ActionKeyword(ModelSQL, ModelView):
 
         clause = [
             ('keyword', '=', keyword),
-            ('model', '=', model + ',-1'),
+            ['OR',
+                ('model', '=', model + ',-1'),
+                ('model', '=', None),
+                ],
             ]
         if model_id >= 0:
             clause = ['OR',