diff --git a/Swiftfin tvOS/Views/ItemView/ItemView.swift b/Swiftfin tvOS/Views/ItemView/ItemView.swift
index 0d78e0dc..1667deec 100644
--- a/Swiftfin tvOS/Views/ItemView/ItemView.swift	
+++ b/Swiftfin tvOS/Views/ItemView/ItemView.swift	
@@ -62,7 +62,7 @@ struct ItemView: View {
 				} else {
 					SeriesItemView(viewModel: SeriesItemViewModel(item: item))
 				}
-			case .boxset:
+			case .boxset, .folder:
 				CinematicCollectionItemView(viewModel: CollectionItemViewModel(item: item))
 			default:
 				Text(L10n.notImplementedYetWithType(item.type ?? ""))
diff --git a/Swiftfin tvOS/Views/LibraryListView.swift b/Swiftfin tvOS/Views/LibraryListView.swift
index d4e5436d..480e20b6 100644
--- a/Swiftfin tvOS/Views/LibraryListView.swift	
+++ b/Swiftfin tvOS/Views/LibraryListView.swift	
@@ -81,7 +81,8 @@ struct LibraryListView: View {
 							}
 						} else {
 							Button {
-								self.libraryListRouter.route(to: \.library, (viewModel: LibraryViewModel(), title: library.name ?? ""))
+								self.libraryListRouter.route(to: \.library,
+								                             (viewModel: LibraryViewModel(parentID: library.id), title: library.name ?? ""))
 							}
 								label: {
 									ZStack {
diff --git a/Swiftfin tvOS/Views/LibraryView.swift b/Swiftfin tvOS/Views/LibraryView.swift
index 6ee1fe63..5c1f397b 100644
--- a/Swiftfin tvOS/Views/LibraryView.swift	
+++ b/Swiftfin tvOS/Views/LibraryView.swift	
@@ -56,17 +56,15 @@ struct LibraryView: View {
 			} cell: { _, cell in
 				GeometryReader { _ in
 					if let item = cell.item {
-						if item.type != "Folder" {
-							Button {
-								libraryRouter.route(to: \.modalItem, item)
-							} label: {
-								PortraitItemElement(item: item)
-							}
-							.buttonStyle(PlainNavigationLinkButtonStyle())
-							.onAppear {
-								if item == viewModel.items.last && viewModel.hasNextPage {
-									viewModel.requestNextPageAsync()
-								}
+						Button {
+							libraryRouter.route(to: \.modalItem, item)
+						} label: {
+							PortraitItemElement(item: item)
+						}
+						.buttonStyle(PlainNavigationLinkButtonStyle())
+						.onAppear {
+							if item == viewModel.items.last && viewModel.hasNextPage {
+								viewModel.requestNextPageAsync()
 							}
 						}
 					} else if cell.loadingCell {