diff --git a/data/glade/gc_control_popup_menu.glade b/data/glade/gc_control_popup_menu.glade
index 7ad038b06..8b3035608 100644
--- a/data/glade/gc_control_popup_menu.glade
+++ b/data/glade/gc_control_popup_menu.glade
@@ -5,6 +5,7 @@
   <widget class="GtkMenu" id="gc_control_popup_menu">
     <child>
       <widget class="GtkImageMenuItem" id="change_nick_menuitem">
+        <property name="no_show_all">True</property>
         <property name="label" translatable="yes">Change _Nickname...</property>
         <property name="use_underline">True</property>
         <child internal-child="image">
@@ -28,6 +29,7 @@
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <child>
               <widget class="GtkImageMenuItem" id="change_subject_menuitem">
+                <property name="no_show_all">True</property>
                 <property name="label" translatable="yes">Change _Subject...</property>
                 <property name="use_underline">True</property>
                 <child internal-child="image">
@@ -53,7 +55,7 @@
               </widget>
             </child>
             <child>
-              <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+              <widget class="GtkSeparatorMenuItem" id="separatormenuitem3">
                 <property name="visible">True</property>
               </widget>
             </child>
@@ -91,12 +93,13 @@
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="seperator">
-        <property name="visible">True</property>
+      <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+        <property name="no_show_all">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="bookmark_room_menuitem">
+        <property name="no_show_all">True</property>
         <property name="label" translatable="yes">_Bookmark</property>
         <property name="use_underline">True</property>
         <child internal-child="image">
@@ -109,13 +112,13 @@
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="seperator">
-        <property name="visible">True</property>
+      <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
+        <property name="no_show_all">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="history_menuitem">
-        <property name="tooltip" translatable="yes">Click to see past conversation in this room</property>
+        <property name="no_show_all">True</property>
         <property name="label" translatable="yes">_History</property>
         <property name="use_underline">True</property>
         <child internal-child="image">
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 9c7666c80..d8fd7a1bb 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -295,6 +295,9 @@ class GroupchatControl(ChatControlBase):
 			self.on_minimize_menuitem_toggled)
 		self.handlers[id] = self.minimize_menuitem
 
+		self.separatormenuitem1 = xm.get_widget('separatormenuitem1')
+		self.separatormenuitem2 = xm.get_widget('separatormenuitem2')
+
 		self.gc_popup_menu = xm.get_widget('gc_control_popup_menu')
 
 		self.name_label = self.xml.get_widget('banner_name_label')
@@ -562,7 +565,7 @@ class GroupchatControl(ChatControlBase):
 
 		self.banner_status_label.set_markup(subject_text)
 
-	def prepare_context_menu(self):
+	def prepare_context_menu(self, hide_buttonbar_entries = False):
 		'''sets sensitivity state for configure_room'''
 		ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
 		self.change_nick_menuitem.add_accelerator('activate', ag, gtk.keysyms.n,
@@ -573,6 +576,22 @@ class GroupchatControl(ChatControlBase):
 			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
 		self.history_menuitem.add_accelerator('activate', ag, gtk.keysyms.h,
 			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+
+		if hide_buttonbar_entries:
+			self.change_nick_menuitem.hide()
+			self.change_subject_menuitem.hide()
+			self.bookmark_room_menuitem.hide()
+			self.history_menuitem.hide()
+			self.separatormenuitem1.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.separatormenuitem2.show()
+
 		if self.contact.jid in gajim.config.get_per('accounts', self.account,
 		'minimized_gc').split(' '):
 			self.minimize_menuitem.set_active(True)