diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 5965cbe2..44a55717 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3247,7 +3247,8 @@ midori_browser_init (MidoriBrowser* browser)
             g_signal_connect (toolitem, "clicked",
                 G_CALLBACK (midori_browser_bookmarkbar_folder_activate_cb),
                 browser);
-            gtk_tool_item_set_tooltip_text (toolitem, desc);
+            if (desc && *desc)
+                gtk_tool_item_set_tooltip_text (toolitem, desc);
             g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item);
             break;
         case KATZE_XBEL_ITEM_KIND_BOOKMARK:
@@ -3257,7 +3258,8 @@ midori_browser_init (MidoriBrowser* browser)
             g_signal_connect (toolitem, "clicked",
                 G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb),
                 browser);
-            gtk_tool_item_set_tooltip_text (toolitem, desc);
+            if (desc && *desc)
+                gtk_tool_item_set_tooltip_text (toolitem, desc);
             g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item);
             break;
         case KATZE_XBEL_ITEM_KIND_SEPARATOR: