diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index ec07bdfad..31421d657 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -278,14 +278,9 @@ class GroupchatControl(ChatControlBase):
 		xm = gtkgui_helpers.get_glade('gc_control_popup_menu.glade')
 
 		self.bookmark_room_menuitem = xm.get_widget('bookmark_room_menuitem')
-		for bm in gajim.connections[self.account].bookmarks:
-			if bm['jid'] == self.room_jid:
-				self.bookmark_room_menuitem.set_sensitive(False)
-				break
-		else:
-			id = self.bookmark_room_menuitem.connect('activate',
-				self._on_bookmark_room_menuitem_activate)
-			self.handlers[id] = self.bookmark_room_menuitem
+		id = self.bookmark_room_menuitem.connect('activate',
+			self._on_bookmark_room_menuitem_activate)
+		self.handlers[id] = self.bookmark_room_menuitem
 
 		self.change_nick_menuitem = xm.get_widget('change_nick_menuitem')
 		id = self.change_nick_menuitem.connect('activate',
@@ -317,7 +312,7 @@ class GroupchatControl(ChatControlBase):
 			self.on_minimize_menuitem_toggled)
 		self.handlers[id] = self.minimize_menuitem
 
-		self.separatormenuitem1 = xm.get_widget('separatormenuitem1')
+		self.bookmark_separator = xm.get_widget('bookmark_separator')
 		self.separatormenuitem2 = xm.get_widget('separatormenuitem2')
 
 		self.gc_popup_menu = xm.get_widget('gc_control_popup_menu')
@@ -663,15 +658,20 @@ class GroupchatControl(ChatControlBase):
 			self.change_subject_menuitem.hide()
 			self.bookmark_room_menuitem.hide()
 			self.history_menuitem.hide()
-			self.separatormenuitem1.hide()
+			self.bookmark_separator.hide()
 			self.separatormenuitem2.hide()
 		else:
 			self.change_nick_menuitem.show()
 			self.change_subject_menuitem.show()
 			self.bookmark_room_menuitem.show()
 			self.history_menuitem.show()
-			self.separatormenuitem1.show()
+			self.bookmark_separator.show()
 			self.separatormenuitem2.show()
+			for bm in gajim.connections[self.account].bookmarks:
+				if bm['jid'] == self.room_jid:
+					self.bookmark_room_menuitem.hide()
+					self.bookmark_separator.hide()
+					break
 
 		if self.contact.jid in gajim.config.get_per('accounts', self.account,
 		'minimized_gc').split(' '):