diff --git a/apps/web/src/app/shared/shared.module.ts b/apps/web/src/app/shared/shared.module.ts
index 54a45bd14ab..0bc8321c171 100644
--- a/apps/web/src/app/shared/shared.module.ts
+++ b/apps/web/src/app/shared/shared.module.ts
@@ -13,20 +13,19 @@ import {
   BadgeListModule,
   BadgeModule,
   ButtonModule,
-  IconButtonModule,
   CalloutModule,
   CheckboxModule,
+  ColorPasswordModule,
   DialogModule,
   FormFieldModule,
+  IconButtonModule,
   IconModule,
   LinkModule,
   MenuModule,
   MultiSelectModule,
-  NavigationModule,
   TableModule,
   TabsModule,
   ToggleGroupModule,
-  ColorPasswordModule,
 } from "@bitwarden/components";
 
 // Register the locales for the application
@@ -50,14 +49,16 @@ import "./locales";
     ToastrModule,
     JslibModule,
 
-    // Component library
+    // Component library modules
+    // Only add components that are used almost everywhere in the application
     AsyncActionsModule,
     AvatarModule,
-    BadgeModule,
     BadgeListModule,
+    BadgeModule,
     ButtonModule,
     CalloutModule,
     CheckboxModule,
+    ColorPasswordModule,
     DialogModule,
     FormFieldModule,
     IconButtonModule,
@@ -65,12 +66,9 @@ import "./locales";
     LinkModule,
     MenuModule,
     MultiSelectModule,
-    NavigationModule,
     TableModule,
     TabsModule,
     ToggleGroupModule,
-    LinkModule,
-    ColorPasswordModule,
 
     // Web specific
   ],
@@ -87,11 +85,12 @@ import "./locales";
     // Component library
     AsyncActionsModule,
     AvatarModule,
-    BadgeModule,
     BadgeListModule,
+    BadgeModule,
     ButtonModule,
     CalloutModule,
     CheckboxModule,
+    ColorPasswordModule,
     DialogModule,
     FormFieldModule,
     IconButtonModule,
@@ -99,12 +98,9 @@ import "./locales";
     LinkModule,
     MenuModule,
     MultiSelectModule,
-    NavigationModule,
     TableModule,
     TabsModule,
     ToggleGroupModule,
-    LinkModule,
-    ColorPasswordModule,
 
     // Web specific
   ],
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.module.ts
new file mode 100644
index 00000000000..fe4ff31b504
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from "@angular/core";
+
+import { NavigationModule } from "@bitwarden/components";
+import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module";
+
+import { LayoutComponent } from "./layout.component";
+import { NavigationComponent } from "./navigation.component";
+import { OrgSwitcherComponent } from "./org-switcher.component";
+
+@NgModule({
+  imports: [SharedModule, NavigationModule],
+  declarations: [LayoutComponent, NavigationComponent, OrgSwitcherComponent],
+})
+export class LayoutModule {}
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets-manager.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets-manager.module.ts
index 6510e95ab2f..754eca24537 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets-manager.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets-manager.module.ts
@@ -2,16 +2,13 @@ import { NgModule } from "@angular/core";
 
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
-import { LayoutComponent } from "./layout/layout.component";
-import { NavigationComponent } from "./layout/navigation.component";
-import { OrgSwitcherComponent } from "./layout/org-switcher.component";
+import { LayoutModule } from "./layout/layout.module";
 import { SecretsManagerSharedModule } from "./shared/sm-shared.module";
 import { SecretsManagerRoutingModule } from "./sm-routing.module";
 import { SMGuard } from "./sm.guard";
 
 @NgModule({
-  imports: [SharedModule, SecretsManagerSharedModule, SecretsManagerRoutingModule],
-  declarations: [LayoutComponent, NavigationComponent, OrgSwitcherComponent],
+  imports: [SharedModule, SecretsManagerSharedModule, SecretsManagerRoutingModule, LayoutModule],
   providers: [SMGuard],
 })
 export class SecretsManagerModule {}