diff --git a/apps/client/src/layouts/desktop_layout.tsx b/apps/client/src/layouts/desktop_layout.tsx
index 530170282..0e9a39caa 100644
--- a/apps/client/src/layouts/desktop_layout.tsx
+++ b/apps/client/src/layouts/desktop_layout.tsx
@@ -5,7 +5,6 @@ import NoteTreeWidget from "../widgets/note_tree.js";
 import NoteTitleWidget from "../widgets/note_title.jsx";
 import NoteDetailWidget from "../widgets/note_detail.js";
 import PromotedAttributesWidget from "../widgets/promoted_attributes.js";
-import NoteListWidget from "../widgets/note_list.js";
 import NoteIconWidget from "../widgets/note_icon.jsx";
 import ScrollingContainer from "../widgets/containers/scrolling_container.js";
 import RootContainer from "../widgets/containers/root_container.js";
@@ -42,6 +41,7 @@ import LeftPaneToggle from "../widgets/buttons/left_pane_toggle.js";
 import ApiLog from "../widgets/api_log.jsx";
 import CloseZenModeButton from "../widgets/close_zen_button.jsx";
 import SharedInfo from "../widgets/shared_info.jsx";
+import NoteList from "../widgets/collections/NoteList.jsx";
 
 export default class DesktopLayout {
 
@@ -138,7 +138,7 @@ export default class DesktopLayout {
                                                                 .child(new PromotedAttributesWidget())
                                                                 .child(<SqlTableSchemas />)
                                                                 .child(new NoteDetailWidget())
-                                                                .child(new NoteListWidget(false))
+                                                                .child(<NoteList />)
                                                                 .child(<SearchResult />)
                                                                 .child(<SqlResults />)
                                                                 .child(<ScrollPadding />)
diff --git a/apps/client/src/layouts/layout_commons.tsx b/apps/client/src/layouts/layout_commons.tsx
index 02171db60..292006011 100644
--- a/apps/client/src/layouts/layout_commons.tsx
+++ b/apps/client/src/layouts/layout_commons.tsx
@@ -27,10 +27,10 @@ import FlexContainer from "../widgets/containers/flex_container.js";
 import NoteIconWidget from "../widgets/note_icon";
 import PromotedAttributesWidget from "../widgets/promoted_attributes.js";
 import NoteDetailWidget from "../widgets/note_detail.js";
-import NoteListWidget from "../widgets/note_list.js";
 import CallToActionDialog from "../widgets/dialogs/call_to_action.jsx";
 import NoteTitleWidget from "../widgets/note_title.jsx";
 import { PopupEditorFormattingToolbar } from "../widgets/ribbon/FormattingToolbar.js";
+import NoteList from "../widgets/collections/NoteList.jsx";
 
 export function applyModals(rootContainer: RootContainer) {
     rootContainer
@@ -66,6 +66,6 @@ export function applyModals(rootContainer: RootContainer) {
                 .child(<PopupEditorFormattingToolbar />)
                 .child(new PromotedAttributesWidget())
                 .child(new NoteDetailWidget())
-                .child(new NoteListWidget(true)))
+                .child(<NoteList displayOnlyCollections />))
         .child(<CallToActionDialog />);
 }
diff --git a/apps/client/src/layouts/mobile_layout.tsx b/apps/client/src/layouts/mobile_layout.tsx
index b7eceffa2..f7d3a1395 100644
--- a/apps/client/src/layouts/mobile_layout.tsx
+++ b/apps/client/src/layouts/mobile_layout.tsx
@@ -5,7 +5,6 @@ import QuickSearchWidget from "../widgets/quick_search.js";
 import NoteTreeWidget from "../widgets/note_tree.js";
 import ScreenContainer from "../widgets/mobile_widgets/screen_container.js";
 import ScrollingContainer from "../widgets/containers/scrolling_container.js";
-import NoteListWidget from "../widgets/note_list.js";
 import GlobalMenuWidget from "../widgets/buttons/global_menu.js";
 import LauncherContainer from "../widgets/containers/launcher_container.js";
 import RootContainer from "../widgets/containers/root_container.js";
@@ -23,6 +22,7 @@ import { MOBILE_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.j
 import ToggleSidebarButton from "../widgets/mobile_widgets/toggle_sidebar_button.jsx";
 import CloseZenModeButton from "../widgets/close_zen_button.js";
 import MobileDetailMenu from "../widgets/mobile_widgets/mobile_detail_menu.js";
+import NoteList from "../widgets/collections/NoteList.jsx";
 
 const MOBILE_CSS = `
 <style>
@@ -151,7 +151,7 @@ export default class MobileLayout {
                                     .filling()
                                     .contentSized()
                                     .child(new NoteDetailWidget())
-                                    .child(new NoteListWidget(false))
+                                    .child(<NoteList />)
                                     .child(<FilePropertiesWrapper />)
                             )
                             .child(<MobileEditorToolbar />)
diff --git a/apps/client/src/widgets/collections/NoteList.tsx b/apps/client/src/widgets/collections/NoteList.tsx
new file mode 100644
index 000000000..e7cb7a588
--- /dev/null
+++ b/apps/client/src/widgets/collections/NoteList.tsx
@@ -0,0 +1,7 @@
+interface NoteListProps {
+    displayOnlyCollections?: boolean;
+}
+
+export default function NoteList({ }: NoteListProps) {
+    return <p>Hi</p>
+}
\ No newline at end of file
diff --git a/apps/client/src/widgets/note_list.ts b/apps/client/src/widgets/collections/note_list.bak
similarity index 94%
rename from apps/client/src/widgets/note_list.ts
rename to apps/client/src/widgets/collections/note_list.bak
index 74602c921..1e14adca2 100644
--- a/apps/client/src/widgets/note_list.ts
+++ b/apps/client/src/widgets/collections/note_list.bak
@@ -1,8 +1,8 @@
-import NoteContextAwareWidget from "./note_context_aware_widget.js";
-import NoteListRenderer from "../services/note_list_renderer.js";
-import type FNote from "../entities/fnote.js";
-import type { CommandListener, CommandListenerData, CommandMappings, CommandNames, EventData, EventNames } from "../components/app_context.js";
-import type ViewMode from "./view_widgets/view_mode.js";
+import NoteContextAwareWidget from "../note_context_aware_widget.js";
+import NoteListRenderer from "./note_list_renderer.ts.bak/index.js";
+import type FNote from "../../entities/fnote.js";
+import type { CommandListener, CommandListenerData, CommandMappings, CommandNames, EventData, EventNames } from "../../components/app_context.js";
+import type ViewMode from "../view_widgets/view_mode.js";
 
 const TPL = /*html*/`
 <div class="note-list-widget">
diff --git a/apps/client/src/services/note_list_renderer.ts b/apps/client/src/widgets/collections/note_list_renderer.ts.bak
similarity index 77%
rename from apps/client/src/services/note_list_renderer.ts
rename to apps/client/src/widgets/collections/note_list_renderer.ts.bak
index 50556715a..19a089e48 100644
--- a/apps/client/src/services/note_list_renderer.ts
+++ b/apps/client/src/widgets/collections/note_list_renderer.ts.bak
@@ -1,11 +1,11 @@
-import type FNote from "../entities/fnote.js";
-import BoardView from "../widgets/view_widgets/board_view/index.js";
-import CalendarView from "../widgets/view_widgets/calendar_view.js";
-import GeoView from "../widgets/view_widgets/geo_view/index.js";
-import ListOrGridView from "../widgets/view_widgets/list_or_grid_view.js";
-import TableView from "../widgets/view_widgets/table_view/index.js";
-import type { ViewModeArgs } from "../widgets/view_widgets/view_mode.js";
-import type ViewMode from "../widgets/view_widgets/view_mode.js";
+import type FNote from "../../entities/fnote.js";
+import BoardView from "../view_widgets/board_view/index.js";
+import CalendarView from "../view_widgets/calendar_view.js";
+import GeoView from "../view_widgets/geo_view/index.js";
+import ListOrGridView from "../view_widgets/list_or_grid_view.js";
+import TableView from "../view_widgets/table_view/index.js";
+import type { ViewModeArgs } from "../view_widgets/view_mode.js";
+import type ViewMode from "../view_widgets/view_mode.js";
 
 const allViewTypes = ["list", "grid", "calendar", "table", "geoMap", "board"] as const;
 export type ArgsWithoutNoteId = Omit<ViewModeArgs, "noteIds">;
diff --git a/apps/client/src/widgets/search_result.tsx b/apps/client/src/widgets/search_result.tsx
index 88ca424fa..adfb1b0a6 100644
--- a/apps/client/src/widgets/search_result.tsx
+++ b/apps/client/src/widgets/search_result.tsx
@@ -3,7 +3,7 @@ import { t } from "../services/i18n";
 import Alert from "./react/Alert";
 import { useNoteContext, useNoteProperty, useTriliumEvent } from "./react/hooks";
 import "./search_result.css";
-import NoteListRenderer from "../services/note_list_renderer";
+// import NoteListRenderer from "../services/note_list_renderer";
 
 enum SearchResultState {    
     NO_RESULTS,
@@ -28,12 +28,13 @@ export default function SearchResult() {
         } else if (searchContainerRef.current) {
             setState(SearchResultState.GOT_RESULTS);
 
-            const noteListRenderer = new NoteListRenderer({
-                $parent: $(searchContainerRef.current),
-                parentNote: note,
-                showNotePath: true
-            });
-            noteListRenderer.renderList();
+            // TODO: Fix me.
+            // const noteListRenderer = new NoteListRenderer({
+            //     $parent: $(searchContainerRef.current),
+            //     parentNote: note,
+            //     showNotePath: true
+            // });
+            // noteListRenderer.renderList();
         }
     }