diff --git a/src/App.tsx b/src/App.tsx
index 2fdfbf5c..2b3fb3aa 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -22,7 +22,7 @@ import { lazyLoadFallback } from '@/modules/core/utils/LazyLoad.tsx';
 import { ErrorBoundary } from '@/modules/core/components/ErrorBoundary.tsx';
 import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
 
-const { Browse } = loadable(() => import('@/screens/Browse'), lazyLoadFallback);
+const { Browse } = loadable(() => import('@/modules/browse/screens/Browse.tsx'), lazyLoadFallback);
 const { DownloadQueue } = loadable(() => import('@/screens/DownloadQueue'), lazyLoadFallback);
 const { Library } = loadable(() => import('@/modules/library/screens/Library.tsx'), lazyLoadFallback);
 const { Manga } = loadable(() => import('@/modules/manga/screens/Manga.tsx'), lazyLoadFallback);
@@ -45,7 +45,7 @@ const { Updates } = loadable(() => import('@/screens/Updates'), lazyLoadFallback
 const { LibrarySettings } = loadable(() => import('@/modules/library/screens/LibrarySettings.tsx'), lazyLoadFallback);
 const { DownloadSettings } = loadable(() => import('@/screens/settings/DownloadSettings.tsx'), lazyLoadFallback);
 const { ServerSettings } = loadable(() => import('@/screens/settings/ServerSettings.tsx'), lazyLoadFallback);
-const { BrowseSettings } = loadable(() => import('@/screens/settings/BrowseSettings.tsx'), lazyLoadFallback);
+const { BrowseSettings } = loadable(() => import('@/modules/browse/screens/BrowseSettings.tsx'), lazyLoadFallback);
 const { WebUISettings } = loadable(() => import('@/screens/settings/WebUISettings.tsx'), lazyLoadFallback);
 const { Migrate } = loadable(() => import('@/modules/migration/screens/Migrate.tsx'), lazyLoadFallback);
 const { DeviceSetting } = loadable(() => import('@/modules/device/screens/DeviceSetting.tsx'), lazyLoadFallback);
diff --git a/src/modules/browse/Browse.types.ts b/src/modules/browse/Browse.types.ts
new file mode 100644
index 00000000..c42719a7
--- /dev/null
+++ b/src/modules/browse/Browse.types.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+export type MetadataBrowseSettings = {
+    hideLibraryEntries: boolean;
+};
diff --git a/src/screens/Browse.tsx b/src/modules/browse/screens/Browse.tsx
similarity index 100%
rename from src/screens/Browse.tsx
rename to src/modules/browse/screens/Browse.tsx
diff --git a/src/screens/settings/BrowseSettings.tsx b/src/modules/browse/screens/BrowseSettings.tsx
similarity index 98%
rename from src/screens/settings/BrowseSettings.tsx
rename to src/modules/browse/screens/BrowseSettings.tsx
index 2287da94..7cd937fb 100644
--- a/src/screens/settings/BrowseSettings.tsx
+++ b/src/modules/browse/screens/BrowseSettings.tsx
@@ -16,7 +16,7 @@ import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.t
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx';
 import { MutableListSetting } from '@/modules/core/components/settings/MutableListSetting.tsx';
-import { MetadataBrowseSettings, ServerSettings as GqlServerSettings } from '@/typings.ts';
+import { ServerSettings as GqlServerSettings } from '@/typings.ts';
 import { TextSetting } from '@/modules/core/components/settings/text/TextSetting.tsx';
 import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
 import {
@@ -27,6 +27,7 @@ import { LoadingPlaceholder } from '@/modules/core/components/placeholder/Loadin
 import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { makeToast } from '@/lib/ui/Toast.ts';
+import { MetadataBrowseSettings } from '@/modules/browse/Browse.types.ts';
 
 type ExtensionsSettings = Pick<GqlServerSettings, 'maxSourcesInParallel' | 'localSourcePath' | 'extensionRepos'>;
 
diff --git a/src/typings.ts b/src/typings.ts
index 89252093..a40c7372 100644
--- a/src/typings.ts
+++ b/src/typings.ts
@@ -16,6 +16,7 @@ import { CategoryMetadataKeys } from '@/modules/category/Category.types.ts';
 import { MetadataUpdateSettings } from '@/modules/app-updates/AppUpdateChecker.types.ts';
 import { MetadataThemeSettings } from '@/modules/theme/AppTheme.types.ts';
 import { MetadataClientSettings } from '@/modules/device/Device.types.ts';
+import { MetadataBrowseSettings } from '@/modules/browse/Browse.types.ts';
 
 export interface IMetadataMigration {
     appKeyPrefix?: { oldPrefix: string; newPrefix: string };
@@ -63,10 +64,6 @@ export type MetadataDownloadSettings = {
     downloadAheadLimit: number;
 };
 
-export type MetadataBrowseSettings = {
-    hideLibraryEntries: boolean;
-};
-
 export type MetadataServerSettings = MetadataDownloadSettings &
     MetadataLibrarySettings &
     MetadataClientSettings &