diff --git a/appcompose/src/main/java/com/readrops/app/compose/feeds/FeedTab.kt b/appcompose/src/main/java/com/readrops/app/compose/feeds/FeedTab.kt
index 0f21a765..e8fdd996 100644
--- a/appcompose/src/main/java/com/readrops/app/compose/feeds/FeedTab.kt
+++ b/appcompose/src/main/java/com/readrops/app/compose/feeds/FeedTab.kt
@@ -114,20 +114,35 @@ object FeedTab : Tab {
                                 items(
                                     items = foldersAndFeeds.toList()
                                 ) { folderWithFeeds ->
+
+                                    fun onFeedClick(feed: Feed) {
+                                        selectedFeed = feed
+                                        selectedFolder = folderWithFeeds.first
+                                        showBottomSheet = true
+                                    }
+
+                                    fun onFeedLongClick(feed: Feed) {
+                                        haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                                        uriHandler.openUri(feed.siteUrl!!)
+                                    }
+
                                     if (folderWithFeeds.first != null) {
                                         FolderExpandableItem(
                                             folder = folderWithFeeds.first!!,
                                             feeds = folderWithFeeds.second,
-                                            onFeedClick = { feed ->
-                                                selectedFeed = feed
-                                                selectedFolder = folderWithFeeds.first
-                                                showBottomSheet = true
-                                            },
-                                            onFeedLongClick = { feed ->
-                                                haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-                                                uriHandler.openUri(feed.siteUrl!!)
-                                            }
+                                            onFeedClick = { feed -> onFeedClick(feed) },
+                                            onFeedLongClick = { feed -> onFeedLongClick(feed) }
                                         )
+                                    } else {
+                                        val feeds = folderWithFeeds.second
+
+                                        for (feed in feeds) {
+                                            FeedItem(
+                                                feed = feed,
+                                                onClick = { onFeedClick(feed) },
+                                                onLongClick = { onFeedLongClick(feed) },
+                                            )
+                                        }
                                     }
                                 }
                             }