diff --git a/apps/browser/src/auth/guards/fido2-auth.guard.ts b/apps/browser/src/auth/popup/guards/fido2-auth.guard.ts
similarity index 93%
rename from apps/browser/src/auth/guards/fido2-auth.guard.ts
rename to apps/browser/src/auth/popup/guards/fido2-auth.guard.ts
index 7d7f1f5c4e9..87d490b3d92 100644
--- a/apps/browser/src/auth/guards/fido2-auth.guard.ts
+++ b/apps/browser/src/auth/popup/guards/fido2-auth.guard.ts
@@ -9,7 +9,7 @@ import {
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 
-import { BrowserRouterService } from "../../platform/popup/services/browser-router.service";
+import { BrowserRouterService } from "../../../platform/popup/services/browser-router.service";
 
 /**
  * This guard verifies the user's authentication status.
diff --git a/apps/browser/src/auth/services/extension-two-factor-auth-component.service.spec.ts b/apps/browser/src/auth/services/extension-two-factor-auth-component.service.spec.ts
index 2247328acab..e8a7953ddb8 100644
--- a/apps/browser/src/auth/services/extension-two-factor-auth-component.service.spec.ts
+++ b/apps/browser/src/auth/services/extension-two-factor-auth-component.service.spec.ts
@@ -22,7 +22,11 @@ import { DuoLaunchAction } from "@bitwarden/auth/angular";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   AuthPopoutType,
   closeSsoAuthResultPopout,
diff --git a/apps/browser/src/auth/services/extension-two-factor-auth-component.service.ts b/apps/browser/src/auth/services/extension-two-factor-auth-component.service.ts
index f768b223984..d0a0048bed1 100644
--- a/apps/browser/src/auth/services/extension-two-factor-auth-component.service.ts
+++ b/apps/browser/src/auth/services/extension-two-factor-auth-component.service.ts
@@ -6,7 +6,11 @@ import {
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 
 import { BrowserApi } from "../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   AuthPopoutType,
   closeSsoAuthResultPopout,
diff --git a/apps/browser/src/auth/services/extension-two-factor-auth-duo-component.service.ts b/apps/browser/src/auth/services/extension-two-factor-auth-duo-component.service.ts
index 594e09fc50c..8fa72cdfc6c 100644
--- a/apps/browser/src/auth/services/extension-two-factor-auth-duo-component.service.ts
+++ b/apps/browser/src/auth/services/extension-two-factor-auth-duo-component.service.ts
@@ -5,6 +5,8 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openTwoFactorAuthDuoPopout } from "../../auth/popup/utils/auth-popout-window";
 import { ZonedMessageListenerService } from "../../platform/browser/zoned-message-listener.service";
 
diff --git a/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.spec.ts b/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.spec.ts
index 01a0129d0e5..310c5c872c6 100644
--- a/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.spec.ts
+++ b/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.spec.ts
@@ -17,7 +17,11 @@ jest.mock("../../platform/popup/browser-popup-utils", () => ({
   inPopup: jest.fn(),
 }));
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openTwoFactorAuthEmailPopout } from "../../auth/popup/utils/auth-popout-window";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
 
 import { ExtensionTwoFactorAuthEmailComponentService } from "./extension-two-factor-auth-email-component.service";
diff --git a/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.ts b/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.ts
index 293d88c4e64..5f785ed2131 100644
--- a/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.ts
+++ b/apps/browser/src/auth/services/extension-two-factor-auth-email-component.service.ts
@@ -6,7 +6,11 @@ import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { DialogService } from "@bitwarden/components";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openTwoFactorAuthEmailPopout } from "../../auth/popup/utils/auth-popout-window";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
 
 // TODO: popup state persistence should eventually remove the need for this service
diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts
index 3c63d423aaa..a798798a980 100644
--- a/apps/browser/src/autofill/background/notification.background.ts
+++ b/apps/browser/src/autofill/background/notification.background.ts
@@ -44,8 +44,12 @@ import { TaskService } from "@bitwarden/common/vault/tasks";
 import { SecurityTaskType } from "@bitwarden/common/vault/tasks/enums";
 import { SecurityTask } from "@bitwarden/common/vault/tasks/models/security-task";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
 import { BrowserApi } from "../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   openAddEditVaultItemPopout,
   openViewVaultItemPopout,
diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts
index 2ff08328e3d..1f249454393 100644
--- a/apps/browser/src/autofill/background/overlay.background.ts
+++ b/apps/browser/src/autofill/background/overlay.background.ts
@@ -49,8 +49,12 @@ import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
 import { BrowserApi } from "../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   openAddEditVaultItemPopout,
   openViewVaultItemPopout,
diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
index 2fb435a4c67..c33cb6a4371 100644
--- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
+++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts
@@ -30,8 +30,12 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
 import { BrowserApi } from "../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   openAddEditVaultItemPopout,
   openVaultItemPasswordRepromptPopout,
diff --git a/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts b/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts
index 04b09a7df32..8de48a49a8e 100644
--- a/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts
+++ b/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts
@@ -28,6 +28,8 @@ import {
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { closeFido2Popout, openFido2Popout } from "../../../vault/popup/utils/vault-popout-window";
 
 const BrowserFido2MessageName = "BrowserFido2UserInterfaceServiceMessage";
diff --git a/apps/browser/src/autofill/services/autofill-browser-settings.service.ts b/apps/browser/src/autofill/services/autofill-browser-settings.service.ts
index ba59a655b77..ed95027cf32 100644
--- a/apps/browser/src/autofill/services/autofill-browser-settings.service.ts
+++ b/apps/browser/src/autofill/services/autofill-browser-settings.service.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { Injectable } from "@angular/core";
 import { BehaviorSubject, Observable } from "rxjs";
 
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index fdd881c2760..6aa99bbda41 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -49,6 +49,8 @@ import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"
 
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { ScriptInjectorService } from "../../platform/services/abstractions/script-injector.service";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openVaultItemPasswordRepromptPopout } from "../../vault/popup/utils/vault-popout-window";
 import { AutofillMessageCommand, AutofillMessageSender } from "../enums/autofill-message.enums";
 import { AutofillPort } from "../enums/autofill-port.enum";
diff --git a/apps/browser/src/background/commands.background.ts b/apps/browser/src/background/commands.background.ts
index f09ebb6c8a1..3e6e86cd3d7 100644
--- a/apps/browser/src/background/commands.background.ts
+++ b/apps/browser/src/background/commands.background.ts
@@ -6,6 +6,8 @@ import { ExtensionCommand, ExtensionCommandType } from "@bitwarden/common/autofi
 import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { openUnlockPopout } from "../auth/popup/utils/auth-popout-window";
 import { LockedVaultPendingNotificationsData } from "../autofill/background/abstractions/notification.background";
 import { BrowserApi } from "../platform/browser/browser-api";
diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts
index ec8ff7376e0..cca17730a22 100644
--- a/apps/browser/src/background/runtime.background.ts
+++ b/apps/browser/src/background/runtime.background.ts
@@ -20,6 +20,8 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum";
 import { BiometricsCommands } from "@bitwarden/key-management";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import {
   closeUnlockPopout,
   openSsoAuthResultPopout,
diff --git a/apps/browser/src/billing/services/families-policy.service.spec.ts b/apps/browser/src/billing/services/families-policy.service.spec.ts
index e9f75d52cb6..3e15ab14094 100644
--- a/apps/browser/src/billing/services/families-policy.service.spec.ts
+++ b/apps/browser/src/billing/services/families-policy.service.spec.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
diff --git a/apps/browser/src/billing/services/families-policy.service.ts b/apps/browser/src/billing/services/families-policy.service.ts
index 42fa43cab1d..222c6b31f29 100644
--- a/apps/browser/src/billing/services/families-policy.service.ts
+++ b/apps/browser/src/billing/services/families-policy.service.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { Injectable } from "@angular/core";
 import { map, Observable, of, switchMap } from "rxjs";
 
diff --git a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
index ef01ade7390..a31a0b311db 100644
--- a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
+++ b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { Injectable } from "@angular/core";
 
 import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout";
diff --git a/apps/browser/src/key-management/key-connector/remove-password.component.ts b/apps/browser/src/key-management/key-connector/remove-password.component.ts
index 1b07f04ba8a..915effc8c33 100644
--- a/apps/browser/src/key-management/key-connector/remove-password.component.ts
+++ b/apps/browser/src/key-management/key-connector/remove-password.component.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { Component } from "@angular/core";
 
 import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/key-management-ui";
diff --git a/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts b/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
index ac5331d3627..612db49acab 100644
--- a/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
+++ b/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
@@ -18,7 +20,11 @@ import {
 import { UnlockOptions } from "@bitwarden/key-management-ui";
 
 import { BrowserApi } from "../../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { BrowserRouterService } from "../../../platform/popup/services/browser-router.service";
 
 import { ExtensionLockComponentService } from "./extension-lock-component.service";
diff --git a/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts b/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
index 6ee1fc5175f..520a0e7571b 100644
--- a/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
+++ b/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { inject } from "@angular/core";
 import { combineLatest, defer, firstValueFrom, map, Observable } from "rxjs";
 
@@ -15,7 +17,11 @@ import { LockComponentService, UnlockOptions } from "@bitwarden/key-management-u
 
 import { BiometricErrors, BiometricErrorTypes } from "../../../models/biometricErrors";
 import { BrowserApi } from "../../../platform/browser/browser-api";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { BrowserRouterService } from "../../../platform/popup/services/browser-router.service";
 
 export class ExtensionLockComponentService implements LockComponentService {
diff --git a/apps/browser/src/platform/browser/run-inside-angular.operator.ts b/apps/browser/src/platform/browser/run-inside-angular.operator.ts
index 4e9b52b009c..f811077314e 100644
--- a/apps/browser/src/platform/browser/run-inside-angular.operator.ts
+++ b/apps/browser/src/platform/browser/run-inside-angular.operator.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { NgZone } from "@angular/core";
 import { MonoTypeOperatorFunction, Observable } from "rxjs";
 
diff --git a/apps/browser/src/platform/browser/zoned-message-listener.service.ts b/apps/browser/src/platform/browser/zoned-message-listener.service.ts
index ce9f7e2021e..88d714e07cb 100644
--- a/apps/browser/src/platform/browser/zoned-message-listener.service.ts
+++ b/apps/browser/src/platform/browser/zoned-message-listener.service.ts
@@ -1,3 +1,5 @@
+// FIXME (PM-22628): angular imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { Injectable, NgZone } from "@angular/core";
 import { Observable } from "rxjs";
 
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 3dde9f15fdb..2963b3daec5 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -43,12 +43,12 @@ import {
 } from "@bitwarden/auth/angular";
 import { LockComponent } from "@bitwarden/key-management-ui";
 
-import { fido2AuthGuard } from "../auth/guards/fido2-auth.guard";
 import { AccountSwitcherComponent } from "../auth/popup/account-switching/account-switcher.component";
 import {
   ExtensionAnonLayoutWrapperComponent,
   ExtensionAnonLayoutWrapperData,
 } from "../auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component";
+import { fido2AuthGuard } from "../auth/popup/guards/fido2-auth.guard";
 import { SetPasswordComponent } from "../auth/popup/set-password.component";
 import { AccountSecurityComponent } from "../auth/popup/settings/account-security.component";
 import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component";
@@ -70,9 +70,6 @@ import { AboutPageV2Component } from "../tools/popup/settings/about-page/about-p
 import { ExportBrowserV2Component } from "../tools/popup/settings/export/export-browser-v2.component";
 import { ImportBrowserV2Component } from "../tools/popup/settings/import/import-browser-v2.component";
 import { SettingsV2Component } from "../tools/popup/settings/settings-v2.component";
-import { canAccessAtRiskPasswords } from "../vault/guards/at-risk-passwords.guard";
-import { clearVaultStateGuard } from "../vault/guards/clear-vault-state.guard";
-import { IntroCarouselGuard } from "../vault/guards/intro-carousel.guard";
 import { AtRiskPasswordsComponent } from "../vault/popup/components/at-risk-passwords/at-risk-passwords.component";
 import { AddEditV2Component } from "../vault/popup/components/vault-v2/add-edit/add-edit-v2.component";
 import { AssignCollections } from "../vault/popup/components/vault-v2/assign-collections/assign-collections.component";
@@ -81,6 +78,9 @@ import { IntroCarouselComponent } from "../vault/popup/components/vault-v2/intro
 import { PasswordHistoryV2Component } from "../vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component";
 import { VaultV2Component } from "../vault/popup/components/vault-v2/vault-v2.component";
 import { ViewV2Component } from "../vault/popup/components/vault-v2/view-v2/view-v2.component";
+import { canAccessAtRiskPasswords } from "../vault/popup/guards/at-risk-passwords.guard";
+import { clearVaultStateGuard } from "../vault/popup/guards/clear-vault-state.guard";
+import { IntroCarouselGuard } from "../vault/popup/guards/intro-carousel.guard";
 import { AppearanceV2Component } from "../vault/popup/settings/appearance-v2.component";
 import { DownloadBitwardenComponent } from "../vault/popup/settings/download-bitwarden.component";
 import { FoldersV2Component } from "../vault/popup/settings/folders-v2.component";
diff --git a/apps/browser/src/vault/guards/at-risk-passwords.guard.ts b/apps/browser/src/vault/popup/guards/at-risk-passwords.guard.ts
similarity index 100%
rename from apps/browser/src/vault/guards/at-risk-passwords.guard.ts
rename to apps/browser/src/vault/popup/guards/at-risk-passwords.guard.ts
diff --git a/apps/browser/src/vault/guards/clear-vault-state.guard.ts b/apps/browser/src/vault/popup/guards/clear-vault-state.guard.ts
similarity index 76%
rename from apps/browser/src/vault/guards/clear-vault-state.guard.ts
rename to apps/browser/src/vault/popup/guards/clear-vault-state.guard.ts
index b212c55d833..e27090180d6 100644
--- a/apps/browser/src/vault/guards/clear-vault-state.guard.ts
+++ b/apps/browser/src/vault/popup/guards/clear-vault-state.guard.ts
@@ -1,9 +1,9 @@
 import { inject } from "@angular/core";
 import { CanDeactivateFn } from "@angular/router";
 
-import { VaultV2Component } from "../popup/components/vault-v2/vault-v2.component";
-import { VaultPopupItemsService } from "../popup/services/vault-popup-items.service";
-import { VaultPopupListFiltersService } from "../popup/services/vault-popup-list-filters.service";
+import { VaultV2Component } from "../components/vault-v2/vault-v2.component";
+import { VaultPopupItemsService } from "../services/vault-popup-items.service";
+import { VaultPopupListFiltersService } from "../services/vault-popup-list-filters.service";
 
 /**
  * Guard to clear the vault state (search and filter) when navigating away from the vault view.
diff --git a/apps/browser/src/vault/guards/intro-carousel.guard.spec.ts b/apps/browser/src/vault/popup/guards/intro-carousel.guard.spec.ts
similarity index 96%
rename from apps/browser/src/vault/guards/intro-carousel.guard.spec.ts
rename to apps/browser/src/vault/popup/guards/intro-carousel.guard.spec.ts
index c9ed994729a..4e850294b0b 100644
--- a/apps/browser/src/vault/guards/intro-carousel.guard.spec.ts
+++ b/apps/browser/src/vault/popup/guards/intro-carousel.guard.spec.ts
@@ -5,7 +5,7 @@ import { of } from "rxjs";
 
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
-import { IntroCarouselService } from "../popup/services/intro-carousel.service";
+import { IntroCarouselService } from "../services/intro-carousel.service";
 
 import { IntroCarouselGuard } from "./intro-carousel.guard";
 
diff --git a/apps/browser/src/vault/guards/intro-carousel.guard.ts b/apps/browser/src/vault/popup/guards/intro-carousel.guard.ts
similarity index 91%
rename from apps/browser/src/vault/guards/intro-carousel.guard.ts
rename to apps/browser/src/vault/popup/guards/intro-carousel.guard.ts
index f101f65c0e7..4a825a0b2a7 100644
--- a/apps/browser/src/vault/guards/intro-carousel.guard.ts
+++ b/apps/browser/src/vault/popup/guards/intro-carousel.guard.ts
@@ -5,7 +5,7 @@ import { firstValueFrom } from "rxjs";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
-import { IntroCarouselService } from "../popup/services/intro-carousel.service";
+import { IntroCarouselService } from "../services/intro-carousel.service";
 
 export const IntroCarouselGuard = async () => {
   const router = inject(Router);
diff --git a/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts b/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts
index 2e715c15af0..97a22bb2cf3 100644
--- a/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts
+++ b/apps/browser/src/vault/services/fido2-user-verification.service.spec.ts
@@ -8,6 +8,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { SetPinComponent } from "./../../auth/popup/components/set-pin.component";
 import { Fido2UserVerificationService } from "./fido2-user-verification.service";
 
diff --git a/apps/browser/src/vault/services/fido2-user-verification.service.ts b/apps/browser/src/vault/services/fido2-user-verification.service.ts
index 8aaababd065..9bf9be70fc8 100644
--- a/apps/browser/src/vault/services/fido2-user-verification.service.ts
+++ b/apps/browser/src/vault/services/fido2-user-verification.service.ts
@@ -8,6 +8,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
+// FIXME (PM-22628): Popup imports are forbidden in background
+// eslint-disable-next-line no-restricted-imports
 import { SetPinComponent } from "../../auth/popup/components/set-pin.component";
 
 export class Fido2UserVerificationService {
diff --git a/apps/browser/webpack.config.js b/apps/browser/webpack.config.js
index e4f60aaf17a..f930f4b96bc 100644
--- a/apps/browser/webpack.config.js
+++ b/apps/browser/webpack.config.js
@@ -8,6 +8,7 @@ const TerserPlugin = require("terser-webpack-plugin");
 const { TsconfigPathsPlugin } = require("tsconfig-paths-webpack-plugin");
 const configurator = require("./config/config");
 const manifest = require("./webpack/manifest");
+const AngularCheckPlugin = require("./webpack/angular-check");
 
 if (process.env.NODE_ENV == null) {
   process.env.NODE_ENV = "development";
@@ -404,7 +405,7 @@ if (manifestVersion == 2) {
       cache: true,
     },
     dependencies: ["main"],
-    plugins: [...requiredPlugins],
+    plugins: [...requiredPlugins /*new AngularCheckPlugin()*/], // TODO (PM-22630): Re-enable this plugin when angular is removed from the background script.
   };
 
   // Safari's desktop build process requires a background.html and vendor.js file to exist
diff --git a/apps/browser/webpack/angular-check.js b/apps/browser/webpack/angular-check.js
new file mode 100644
index 00000000000..c14708617d1
--- /dev/null
+++ b/apps/browser/webpack/angular-check.js
@@ -0,0 +1,21 @@
+/**
+ * Webpack plugin that errors if it detects angular imports.
+ */
+class AngularCheckPlugin {
+  apply(compiler) {
+    compiler.hooks.assetEmitted.tap("AngularCheckPlugin", (file, info) => {
+      // Ensure we only check outputted JavaScript files
+      if (!file.endsWith(".js")) {
+        return;
+      }
+
+      if (info.content.includes("@angular")) {
+        throw new Error(
+          `Angular detected in ${file}. Please ensure angular is not imported to non popup scripts.`,
+        );
+      }
+    });
+  }
+}
+
+module.exports = AngularCheckPlugin;
diff --git a/eslint.config.mjs b/eslint.config.mjs
index de0e6e9850d..f08523d5878 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -279,6 +279,31 @@ export default tseslint.config(
       ]),
     },
   },
+  // Browser background and content scripts are not allowed to import from the popup directory
+  {
+    files: ["apps/browser/src/**/*.ts"],
+    rules: {
+      "no-restricted-imports": buildNoRestrictedImports([
+        "@angular",
+        "bitwarden_license/**",
+        "@bitwarden/bit-common/*",
+        "@bitwarden/bit-web/*",
+
+        "**/popup/*",
+      ]),
+    },
+  },
+  // This removes the previous rule forbidding imports from the popup directory
+  {
+    files: ["apps/browser/src/**/popup/**/*.ts"],
+    rules: {
+      "no-restricted-imports": buildNoRestrictedImports([
+        "bitwarden_license/**",
+        "@bitwarden/bit-common/*",
+        "@bitwarden/bit-web/*",
+      ]),
+    },
+  },
   {
     files: ["libs/nx-plugin/**/*.ts", "libs/nx-plugin/**/*.js"],
     rules: {