diff --git a/apps/browser/src/tools/popup/generator/credential-generator.component.html b/apps/browser/src/tools/popup/generator/credential-generator.component.html
index aed02b46178..3fbd232c33d 100644
--- a/apps/browser/src/tools/popup/generator/credential-generator.component.html
+++ b/apps/browser/src/tools/popup/generator/credential-generator.component.html
@@ -5,7 +5,7 @@
       <app-current-account />
     </ng-container>
   </popup-header>
-  <tools-credential-generator />
+  <tools-credential-generator [website]="website$ | async" />
   <bit-item>
     <a type="button" bit-item-content routerLink="/generator-history">
       {{ "generatorHistory" | i18n }}
diff --git a/apps/browser/src/tools/popup/generator/credential-generator.component.ts b/apps/browser/src/tools/popup/generator/credential-generator.component.ts
index b34c829b006..a997fe8dc1a 100644
--- a/apps/browser/src/tools/popup/generator/credential-generator.component.ts
+++ b/apps/browser/src/tools/popup/generator/credential-generator.component.ts
@@ -1,11 +1,14 @@
+import { CommonModule } from "@angular/common";
 import { Component } from "@angular/core";
 import { RouterModule } from "@angular/router";
+import { distinctUntilChanged, from, map, merge, shareReplay, startWith, Subject } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ItemModule } from "@bitwarden/components";
 import { GeneratorModule } from "@bitwarden/generator-components";
 
 import { CurrentAccountComponent } from "../../../auth/popup/account-switching/current-account.component";
+import { BrowserApi } from "../../../platform/browser/browser-api";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
@@ -14,6 +17,7 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
   selector: "credential-generator",
   templateUrl: "credential-generator.component.html",
   imports: [
+    CommonModule,
     GeneratorModule,
     CurrentAccountComponent,
     JslibModule,
@@ -24,4 +28,33 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
     ItemModule,
   ],
 })
-export class CredentialGeneratorComponent {}
+export class CredentialGeneratorComponent {
+  website$ = this.buildWebsiteObservable();
+
+  private buildWebsiteObservable() {
+    // Initial URL in the active tab
+    const initial$ = from(chrome.tabs.query({ active: true, currentWindow: true })).pipe(
+      map((tabs) => tabs[0]?.url ?? null),
+    );
+
+    // URL update in the active tab
+    const updated$ = new Subject<string | null>();
+    BrowserApi.addListener(chrome.tabs.onUpdated, (_tabId, changeInfo, tab) => {
+      if (tab.active && changeInfo.url) {
+        updated$.next(changeInfo.url!);
+      }
+    });
+
+    // tab switching
+    const activated$ = new Subject<string | null>();
+    BrowserApi.addListener(chrome.tabs.onActivated, async ({ tabId }) => {
+      await chrome.tabs.get(tabId).then((tab) => activated$.next(tab.url ?? null));
+    });
+
+    return merge(initial$, updated$, activated$).pipe(
+      startWith(null),
+      distinctUntilChanged(),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+  }
+}