diff --git a/gajim/gui_menu_builder.py b/gajim/gui_menu_builder.py
index 030a7b5f8..4f47be865 100644
--- a/gajim/gui_menu_builder.py
+++ b/gajim/gui_menu_builder.py
@@ -905,19 +905,13 @@ def get_conv_context_menu(account, kind, text):
         menuitem.set_label(label)
 
         if action.startswith('-'):
+            text = text.replace('xmpp:', '')
+            text = text.split('?')[0]
             action = 'app.%s%s' % (account, action)
         else:
             action = 'app.%s' % action
         menuitem.set_action_name(action)
 
-        if 'join-groupchat' in action:
-            text = text.replace('xmpp:', '')
-            text = text.split('?')[0]
-
-        if 'add-contact' in action:
-            text = text.replace('xmpp:', '')
-            text = text.split('?')[0]
-
         if action == 'app.open-link':
             value = GLib.Variant.new_strv([kind, text])
         elif action == 'app.copy-link':