diff --git a/src/roster_window.py b/src/roster_window.py
index 0480e6b3fe2c89e4523a4e9f17bfa219f7ad4c62..c92460f29aaa308c33be3f974d87a056ffe242d8 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -6167,8 +6167,13 @@ class RosterWindow:
             gc_sub_menu.append(item)
 
         for bookmark in gajim.connections[account].bookmarks:
+            name = bookmark['name']
+            if bookmark['name'] == '':
+                # No name was given for this bookmark.
+                # Use the first part of JID instead...
+                name = bookmark['jid'].split("@")[0]
             # Do not use underline.
-            item = gtk.MenuItem(bookmark['name'], False)
+            item = gtk.MenuItem(name, False)
             item.connect('activate', self.on_bookmark_menuitem_activate,
                     account, bookmark)
             gc_sub_menu.append(item)