diff --git a/tryton/common/cellrendererbutton.py b/tryton/common/cellrendererbutton.py
index 76a6fb5dc3..f261dc9b90 100644
--- a/tryton/common/cellrendererbutton.py
+++ b/tryton/common/cellrendererbutton.py
@@ -61,7 +61,7 @@ class CellRendererButton(gtk.GenericCellRenderer):
 
     def on_start_editing(self, event, widget, path, background_area,
             cell_area, flags):
-        if event is not None and ((event.type == gtk.gdk.BUTTON_PRESS) \
+        if (event is None) or ((event.type == gtk.gdk.BUTTON_PRESS) \
                 or (event.type == gtk.gdk.KEY_PRESS \
                     and event.keyval == gtk.keysyms.space)):
             self.clicking = True
diff --git a/tryton/gui/window/view_form/view/list.py b/tryton/gui/window/view_form/view/list.py
index a2b7b01d40..94840ddb98 100644
--- a/tryton/gui/window/view_form/view/list.py
+++ b/tryton/gui/window/view_form/view/list.py
@@ -396,7 +396,9 @@ class ViewList(ParserView):
         del self.widget_tree
         del self.widget
 
-    def __sig_switch(self, treeview, *args):
+    def __sig_switch(self, treeview, path, column):
+        if column._type == 'button':
+            return
         self.screen.row_activate()
 
     def __select_changed(self, tree_sel):