diff --git a/jslib b/jslib
index f39bdc4269..2ef1b7d65c 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit f39bdc4269c1105211ac901b7d2d51978375b222
+Subproject commit 2ef1b7d65c02f7f204a0bb5a46c28aa093be274d
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 4f1ba7dbdb..d9e6c1af8e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -35,7 +35,7 @@ import { AutofocusDirective } from 'jslib/angular/directives/autofocus.directive
 import { BlurClickDirective } from 'jslib/angular/directives/blur-click.directive';
 import { BoxRowDirective } from 'jslib/angular/directives/box-row.directive';
 import { FallbackSrcDirective } from 'jslib/angular/directives/fallback-src.directive';
-import { FlexCopyDirective } from 'jslib/angular/directives/flex-copy.directive';
+import { SelectCopyDirective } from 'jslib/angular/directives/select-copy.directive';
 import { StopClickDirective } from 'jslib/angular/directives/stop-click.directive';
 import { StopPropDirective } from 'jslib/angular/directives/stop-prop.directive';
 import { TrueFalseValueDirective } from 'jslib/angular/directives/true-false-value.directive';
@@ -155,7 +155,6 @@ registerLocaleData(localeZhTw, 'zh-TW');
         EnvironmentComponent,
         ExportComponent,
         FallbackSrcDirective,
-        FlexCopyDirective,
         FolderAddEditComponent,
         GroupingsComponent,
         HintComponent,
@@ -170,6 +169,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
         PremiumComponent,
         RegisterComponent,
         SearchCiphersPipe,
+        SelectCopyDirective,
         SettingsComponent,
         ShareComponent,
         StopClickDirective,
diff --git a/src/app/vault/password-generator-history.component.html b/src/app/vault/password-generator-history.component.html
index 9baaaea457..7a6c28de51 100644
--- a/src/app/vault/password-generator-history.component.html
+++ b/src/app/vault/password-generator-history.component.html
@@ -9,7 +9,7 @@
                     <div class="box-content condensed">
                         <div class="box-content-row box-content-row-flex" *ngFor="let h of history">
                             <div class="row-main">
-                                <div class="text password-wrapper monospaced" appFlexCopy
+                                <div class="password-wrapper monospaced" appSelectCopy
                                     [innerHTML]="h.password | colorPassword"></div>
                                 <span class="detail">{{h.date | date:'medium'}}</span>
                             </div>
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index c192638aec..61297d5168 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -2,7 +2,9 @@
     <div class="modal-dialog modal-sm">
         <div class="modal-content">
             <div class="modal-body">
-                <div class="password-block" [innerHTML]="password | colorPassword" appFlexCopy></div>
+                <div class="password-block">
+                    <div class="password-wrapper" [innerHTML]="password | colorPassword" appSelectCopy></div>
+                </div>
                 <div class="box">
                     <div class="box-content condensed">
                         <a class="box-content-row" href="#" appStopClick appBlurClick (click)="regenerate()">
diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html
index 4ef9b6aca8..45ef5fdae1 100644
--- a/src/app/vault/view.component.html
+++ b/src/app/vault/view.component.html
@@ -26,9 +26,9 @@
                     <div class="box-content-row box-content-row-flex" *ngIf="cipher.login.password">
                         <div class="row-main">
                             <span class="row-label">{{'password' | i18n}}</span>
-                            <div [hidden]="showPassword" class="monospaced password-wrapper" appFlexCopy>
+                            <div [hidden]="showPassword" class="monospaced">
                                 {{cipher.login.maskedPassword}}</div>
-                            <div [hidden]="!showPassword" class="monospaced password-wrapper" appFlexCopy
+                            <div [hidden]="!showPassword" class="monospaced password-wrapper" appSelectCopy
                                 [innerHTML]="cipher.login.password | colorPassword"></div>
                         </div>
                         <div class="action-buttons">
diff --git a/src/scss/box.scss b/src/scss/box.scss
index 64d731dc27..01c1b11896 100644
--- a/src/scss/box.scss
+++ b/src/scss/box.scss
@@ -153,6 +153,7 @@
 
     .row-main {
         flex-grow: 1;
+        min-width: 0;
     }
 
     &.box-content-row-flex, .box-content-row-flex, &.box-content-row-checkbox, &.box-content-row-input,
diff --git a/src/scss/misc.scss b/src/scss/misc.scss
index c1dc668808..67caae84aa 100644
--- a/src/scss/misc.scss
+++ b/src/scss/misc.scss
@@ -184,12 +184,9 @@ p.lead {
 }
 
 .password-wrapper {
-    display: flex !important;
-    flex-wrap: wrap;
-
-    span {
-        white-space: pre;
-    }
+    word-break: break-all;
+    white-space: pre-wrap;
+    min-width: 0;
 }
 
 .password-number {