diff --git a/ram/portal/templates/bookshelf/bookshelf_menu.html b/ram/portal/templates/bookshelf/bookshelf_menu.html
index 52ce111..7321045 100644
--- a/ram/portal/templates/bookshelf/bookshelf_menu.html
+++ b/ram/portal/templates/bookshelf/bookshelf_menu.html
@@ -4,8 +4,12 @@
                     Bookshelf
                   </a>
                   <ul class="dropdown-menu" aria-labelledby="bookshelfDropdownMenuLink">
+                    {% if books_menu %}
                     <li><a class="dropdown-item" href="{% url 'books' %}">Books</a></li>
+                    {% endif %}
+                    {% if catalogs_menu %}
                     <li><a class="dropdown-item" href="{% url 'catalogs' %}">Catalogs</a></li>
+                    {% endif %}
                   </ul>
                 </li>
                 {% endif %}
diff --git a/ram/portal/templatetags/show_menu.py b/ram/portal/templatetags/show_menu.py
index 951a7ba..35421dd 100644
--- a/ram/portal/templatetags/show_menu.py
+++ b/ram/portal/templatetags/show_menu.py
@@ -7,8 +7,11 @@ register = template.Library()
 
 @register.inclusion_tag('bookshelf/bookshelf_menu.html')
 def show_bookshelf_menu():
+    # FIXME: Filter out unpublished books and catalogs?
     return {
-        "bookshelf_menu": (Book.objects.exists() or Catalog.objects.exists())
+        "bookshelf_menu": (Book.objects.exists() or Catalog.objects.exists()),
+        "books_menu": Book.objects.exists(),
+        "catalogs_menu": Catalog.objects.exists(),
     }