diff --git a/CHANGELOG b/CHANGELOG
index adc216c9bd..d9faa37628 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Escape '_' in button string
 * Export selected records only
 * Use HTML for RichText widget
 * Change Progressbar to work with float between 0 and 1
diff --git a/tryton/common/button.py b/tryton/common/button.py
index 0a4bb28301..6ba98c0e19 100644
--- a/tryton/common/button.py
+++ b/tryton/common/button.py
@@ -9,9 +9,7 @@ class Button(gtk.Button):
 
     def __init__(self, attrs=None):
         self.attrs = attrs or {}
-        label = attrs.get('string', '')
-        if '_' not in label:
-            label = '_' + label
+        label = '_' + attrs.get('string', '').replace('_', '__')
         super(Button, self).__init__(label=label, stock=None,
             use_underline=True)
         self._set_icon(attrs.get('icon'))