diff --git a/src/popup/scss/misc.scss b/src/popup/scss/misc.scss
index 545103c46c..d8f210d421 100644
--- a/src/popup/scss/misc.scss
+++ b/src/popup/scss/misc.scss
@@ -120,6 +120,10 @@ p.lead {
     font-family: $font-family-monospace;
 }
 
+.show-whitespace {
+    white-space: pre-wrap;
+}
+
 .img-responsive {
     display: block;
     max-width: 100%;
@@ -144,6 +148,10 @@ p.lead {
 .password-wrapper {
     display: flex !important;
     flex-wrap: wrap;
+
+    span {
+        white-space: pre;
+    }
 }
 
 .password-number {
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html
index 66174d7f11..6c37854672 100644
--- a/src/popup/vault/view.component.html
+++ b/src/popup/vault/view.component.html
@@ -219,7 +219,7 @@
                         {{field.value || ' '}}
                     </div>
                     <div *ngIf="field.type === fieldType.Hidden">
-                        <span [hidden]="!field.showValue" class="monospaced">{{field.value}}</span>
+                        <span [hidden]="!field.showValue" class="monospaced show-whitespace">{{field.value}}</span>
                         <span [hidden]="field.showValue" class="monospaced">{{field.maskedValue}}</span>
                     </div>
                     <div *ngIf="field.type === fieldType.Boolean">