diff --git a/data/glade/message_window.glade b/data/glade/message_window.glade
index a0f8293bfad2dc456b97fc6debb0bea94ebc7628..6bc5daa8cc1d0df2e3b2860009256f41eda79a72 100644
--- a/data/glade/message_window.glade
+++ b/data/glade/message_window.glade
@@ -735,6 +735,7 @@
                     <child>
                       <widget class="GtkButton" id="bookmark_button">
                         <property name="visible">True</property>
+                        <property name="no_show_all">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip" translatable="yes">Bookmark this room (Ctrl+B)</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 2edf9b5eabfb7525a0fab80cc93ac5a4ab19dbb5..ec07bdfaded0b45879cdda859d9e403bea941eff 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -196,12 +196,13 @@ def __init__(self, parent_win, contact, acct, is_continued=False):
 		widget = self.xml.get_widget('bookmark_button')
 		for bm in gajim.connections[self.account].bookmarks:
 			if bm['jid'] == self.contact.jid:
-				widget.set_sensitive(False)
+				widget.hide()
 				break
 		else:
 			id = widget.connect('clicked',
 				self._on_bookmark_room_menuitem_activate)
 			self.handlers[id] = widget
+			widget.show()
 
 		widget = self.xml.get_widget('list_treeview')
 		id = widget.connect('row_expanded', self.on_list_treeview_row_expanded)