diff --git a/src/components/navigation/filter.js b/src/components/navigation/filter.js
index 325bb5a43..69d0b43cb 100644
--- a/src/components/navigation/filter.js
+++ b/src/components/navigation/filter.js
@@ -15,8 +15,8 @@ export const filterNavigation = (list = [], {
     if ((!currentUser || !currentUser.locked) && set.has('lockedUser')) return false
     if (!hasChats && set.has('chats')) return false
     if (!hasAnnouncements && set.has('announcements')) return false
-    if (supportsBookmarkFolders && set.has('!supportsBookmarkFolders')) return false
-    if (supportsBubbleTimeline && set.has('!supportsBubbleTimeline')) return false
+    if (!supportsBookmarkFolders && set.has('supportsBookmarkFolders')) return false
+    if (!supportsBubbleTimeline && set.has('supportsBubbleTimeline')) return false
     return true
   })
 }
diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js
index 6702bea4e..80da8f52d 100644
--- a/src/components/navigation/navigation.js
+++ b/src/components/navigation/navigation.js
@@ -29,9 +29,10 @@ export const TIMELINES = {
   },
   bubble: {
     route: 'bubble',
+    anon: true,
     icon: 'city',
     label: 'nav.bubble',
-    criteria: ['supportsBubbleTimeline']
+    criteria: ['!private', 'federating', 'supportsBubbleTimeline']
   },
   twkn: {
     route: 'public-external-timeline',
@@ -44,7 +45,7 @@ export const TIMELINES = {
     route: 'bookmarks',
     icon: 'bookmark',
     label: 'nav.bookmarks',
-    criteria: ['!supportsBookmarkFolders']
+    criteria: ['supportsBookmarkFolders']
   },
   favorites: {
     routeObject: { name: 'user-profile', query: { tab: 'favorites' } },