diff --git a/src/popup/generator/password-generator-history.component.html b/src/popup/generator/password-generator-history.component.html
index 9d8fbeb530..cbee735f7f 100644
--- a/src/popup/generator/password-generator-history.component.html
+++ b/src/popup/generator/password-generator-history.component.html
@@ -20,7 +20,7 @@
             <div class="box-content-row box-content-row-flex" *ngFor="let h of history">
                 <div class="row-main">
                     <div class="row-main-content">
-                        <span class="text monospaced no-ellipsis">
+                        <span class="text monospaced no-ellipsis break-all">
                             {{h.password}}
                         </span>
                         <span class="detail">{{h.date | date:'medium'}}</span>
diff --git a/src/popup/scss/misc.scss b/src/popup/scss/misc.scss
index cfb4bc700d..ab5d104db3 100644
--- a/src/popup/scss/misc.scss
+++ b/src/popup/scss/misc.scss
@@ -68,6 +68,10 @@ p.lead {
     padding-bottom: 0 !important;
 }
 
+.break-all {
+    word-break: break-all;
+}
+
 [hidden] {
     display: none !important;
 }
@@ -124,14 +128,6 @@ app-root > #loading {
     color: $text-muted;
 }
 
-app-password-generator .password-block {
-    font-size: $font-size-large;
-    word-break: break-all;
-    font-family: $font-family-monospace;
-    text-align: center;
-    margin: 20px;
-}
-
 app-vault-icon {
     display: flex;
 }
diff --git a/src/popup/scss/pages.scss b/src/popup/scss/pages.scss
index 164360f9d8..5d8d916501 100644
--- a/src/popup/scss/pages.scss
+++ b/src/popup/scss/pages.scss
@@ -7,3 +7,11 @@ app-sync {
         }
     }
 }
+
+app-password-generator .password-block {
+    font-size: $font-size-large;
+    word-break: break-all;
+    font-family: $font-family-monospace;
+    text-align: center;
+    margin: 20px;
+}