diff --git a/src/chat_control.py b/src/chat_control.py
index 98efd246b..64dc56d41 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -641,7 +641,7 @@ class ChatControlBase(MessageControl):
 		jid = contact.jid
 
 		if self.type_id == message_control.TYPE_GC:
-			start_removing_from = 7 # # this is from the seperator and after
+			start_removing_from = 6 # # this is from the seperator and after
 		else:
 			if _('Not in Roster') in contact.groups: # for add_to_roster_menuitem
 				childs[5].show()
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 700c70ce5..081e61c03 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -301,6 +301,7 @@ class GroupchatControl(ChatControlBase):
 		c = gajim.contacts.get_gc_contact(self.account, self.room_jid, self.nick)
 		if c.affiliation not in ('owner', 'admin'):
 			childs[1].set_sensitive(False)
+		menu = self.remove_possible_switch_to_menuitems(menu)
 		return menu
 
 	def on_message(self, nick, msg, tim):