diff --git a/apps/web/src/app/tools/generator.component.ts b/apps/web/src/app/tools/generator.component.ts
index 22a99e03fa9..6587fc5d8a2 100644
--- a/apps/web/src/app/tools/generator.component.ts
+++ b/apps/web/src/app/tools/generator.component.ts
@@ -1,7 +1,7 @@
-import { Component, ViewChild, ViewContainerRef } from "@angular/core";
+import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 
-import { ModalService } from "@bitwarden/angular/services/modal.service";
+import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
 import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/tools/generator/components/generator.component";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
@@ -17,9 +17,6 @@ import { PasswordGeneratorHistoryComponent } from "./password-generator-history.
   templateUrl: "generator.component.html",
 })
 export class GeneratorComponent extends BaseGeneratorComponent {
-  @ViewChild("historyTemplate", { read: ViewContainerRef, static: true })
-  historyModalRef: ViewContainerRef;
-
   constructor(
     passwordGenerationService: PasswordGenerationServiceAbstraction,
     usernameGenerationService: UsernameGenerationServiceAbstraction,
@@ -28,7 +25,7 @@ export class GeneratorComponent extends BaseGeneratorComponent {
     i18nService: I18nService,
     logService: LogService,
     route: ActivatedRoute,
-    private modalService: ModalService
+    private dialogService: DialogServiceAbstraction
   ) {
     super(
       passwordGenerationService,
@@ -47,7 +44,7 @@ export class GeneratorComponent extends BaseGeneratorComponent {
   }
 
   async history() {
-    await this.modalService.openViewRef(PasswordGeneratorHistoryComponent, this.historyModalRef);
+    this.dialogService.open(PasswordGeneratorHistoryComponent);
   }
 
   lengthChanged() {
diff --git a/apps/web/src/app/tools/password-generator-history.component.html b/apps/web/src/app/tools/password-generator-history.component.html
index 93c97f7182c..a4b382c4b51 100644
--- a/apps/web/src/app/tools/password-generator-history.component.html
+++ b/apps/web/src/app/tools/password-generator-history.component.html
@@ -1,59 +1,47 @@
-<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="passHistoryTitle">
-  <div class="modal-dialog modal-dialog-scrollable" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h1 class="modal-title" id="passHistoryTitle">{{ "passwordHistory" | i18n }}</h1>
-        <button
-          type="button"
-          class="close"
-          data-dismiss="modal"
-          appA11yTitle="{{ 'close' | i18n }}"
-        >
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body" *ngIf="history.length">
-        <ul class="list-group list-group-flush">
-          <li class="list-group-item d-flex" *ngFor="let h of history">
-            <div class="tw-min-w-0">
-              <bit-color-password
-                [password]="h.password"
-                class="tw-block tw-font-mono"
-                appSelectCopy
-              ></bit-color-password>
-              <small class="text-muted">{{ h.date | date : "medium" }}</small>
-            </div>
-            <div class="ml-auto">
-              <button
-                type="button"
-                class="btn btn-link"
-                appA11yTitle="{{ 'copyPassword' | i18n }}"
-                (click)="copy(h.password)"
-              >
-                <i class="bwi bwi-lg bwi-clone" aria-hidden="true"></i>
-              </button>
-            </div>
-          </li>
-        </ul>
-      </div>
-      <div class="modal-body" *ngIf="!history.length">
-        {{ "noPasswordsInList" | i18n }}
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
-          {{ "close" | i18n }}
-        </button>
-        <div class="ml-auto">
-          <button
-            type="button"
-            (click)="clear()"
-            class="btn btn-outline-danger"
-            appA11yTitle="{{ 'clear' | i18n }}"
-          >
-            <i class="bwi bwi-trash bwi-lg bwi-fw" aria-hidden="true"></i>
-          </button>
-        </div>
-      </div>
+<bit-dialog>
+  <span bitDialogTitle>
+    {{ "passwordHistory" | i18n }}
+  </span>
+  <span bitDialogContent>
+    <bit-table *ngIf="history.length">
+      <ng-template body>
+        <tr bitRow *ngFor="let h of history">
+          <td bitCell>
+            <bit-color-password
+              [password]="h.password"
+              class="tw-block tw-font-mono"
+              appSelectCopy
+            ></bit-color-password>
+            <small bitTypography="body2" class="tw-text-muted">
+              {{ h.date | date : "medium" }}
+            </small>
+          </td>
+          <td bitCell class="tw-w-0">
+            <button
+              type="button"
+              bitIconButton="bwi-clone"
+              (click)="copy(h.password)"
+              [appA11yTitle]="'copyPassword' | i18n"
+            ></button>
+          </td>
+        </tr>
+      </ng-template>
+    </bit-table>
+    <div *ngIf="!history.length">
+      {{ "noPasswordsInList" | i18n }}
     </div>
-  </div>
-</div>
+  </span>
+  <ng-container bitDialogFooter>
+    <button type="button" bitButton buttonType="secondary" bitDialogClose>
+      {{ "close" | i18n }}
+    </button>
+    <button
+      type="button"
+      class="tw-ml-auto"
+      bitIconButton="bwi-trash"
+      buttonType="danger"
+      title="{{ 'clear' | i18n }}"
+      [bitAction]="clear"
+    ></button>
+  </ng-container>
+</bit-dialog>
diff --git a/libs/angular/src/tools/generator/components/password-generator-history.component.ts b/libs/angular/src/tools/generator/components/password-generator-history.component.ts
index 3b86ef05e43..1c2e93928ab 100644
--- a/libs/angular/src/tools/generator/components/password-generator-history.component.ts
+++ b/libs/angular/src/tools/generator/components/password-generator-history.component.ts
@@ -22,10 +22,10 @@ export class PasswordGeneratorHistoryComponent implements OnInit {
     this.history = await this.passwordGenerationService.getHistory();
   }
 
-  clear() {
+  clear = async () => {
     this.history = [];
-    this.passwordGenerationService.clear();
-  }
+    await this.passwordGenerationService.clear();
+  };
 
   copy(password: string) {
     const copyOptions = this.win != null ? { window: this.win } : null;