diff --git a/src/gui/views/tags.py b/src/gui/views/tags.py
index d1fe60f1e..de424cb44 100644
--- a/src/gui/views/tags.py
+++ b/src/gui/views/tags.py
@@ -210,9 +210,8 @@ class Tags(DbGUIElement):
         tag_menu += '<menuitem action="OrganizeTags"/>'
         tag_menu += '<separator/>'
         for tag_name, handle in self.__tag_list:
-            tag_menu += '<menuitem action="TAG_%s"/>' % escape(tag_name,
-                                                               {'"':'&quot;'})
-            actions.append(('TAG_%s' % tag_name, None, tag_name, None, None,
+            tag_menu += '<menuitem action="TAG_%s"/>' % handle
+            actions.append(('TAG_%s' % handle, None, tag_name, None, None,
                          make_callback(self.tag_selected_rows, handle)))
         
         self.tag_ui = TAG_1 + tag_menu + TAG_2 + tag_menu + TAG_3