diff --git a/tryton/gui/window/view_form/view/form_gtk/one2many.py b/tryton/gui/window/view_form/view/form_gtk/one2many.py
index 0e8e581236..8abdbbaf0e 100644
--- a/tryton/gui/window/view_form/view/form_gtk/one2many.py
+++ b/tryton/gui/window/view_form/view/form_gtk/one2many.py
@@ -134,7 +134,11 @@ def _create_menu(self, attrs):
     but_switch.add(img_switch)
     but_switch.set_relief(gtk.RELIEF_NONE)
     hbox.pack_start(but_switch, expand=False, fill=False)
-    hbox.set_focus_chain([])
+
+    if attrs.get('add_remove'):
+        hbox.set_focus_chain([self.wid_text])
+    else:
+        hbox.set_focus_chain([])
 
     tooltips.enable()