diff --git a/jslib b/jslib
index dc37528d22..2ef1b7d65c 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit dc37528d223cd12f37297c80e6ad54ab68dfb109
+Subproject commit 2ef1b7d65c02f7f204a0bb5a46c28aa093be274d
diff --git a/src/popup/app.module.ts b/src/popup/app.module.ts
index 72737db665..1aeb418bc9 100644
--- a/src/popup/app.module.ts
+++ b/src/popup/app.module.ts
@@ -50,8 +50,8 @@ 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 { InputVerbatimDirective } from 'jslib/angular/directives/input-verbatim.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';
@@ -169,7 +169,6 @@ registerLocaleData(localeZhTw, 'zh-TW');
         EnvironmentComponent,
         ExportComponent,
         FallbackSrcDirective,
-        FlexCopyDirective,
         FolderAddEditComponent,
         FoldersComponent,
         GroupingsComponent,
@@ -189,6 +188,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
         PrivateModeComponent,
         RegisterComponent,
         SearchCiphersPipe,
+        SelectCopyDirective,
         SettingsComponent,
         ShareComponent,
         StopClickDirective,
diff --git a/src/popup/generator/password-generator-history.component.html b/src/popup/generator/password-generator-history.component.html
index 0f5e4b526d..3a4c5efbc7 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">
-                        <div class="text monospaced password-wrapper no-ellipsis" appFlexCopy
+                        <div class="monospaced password-wrapper" appSelectCopy
                             [innerHTML]="h.password | colorPassword"></div>
                         <span class="detail">{{h.date | date:'medium'}}</span>
                     </div>
diff --git a/src/popup/generator/password-generator.component.html b/src/popup/generator/password-generator.component.html
index 9a2c818793..1ce8b20b3a 100644
--- a/src/popup/generator/password-generator.component.html
+++ b/src/popup/generator/password-generator.component.html
@@ -11,7 +11,7 @@
     </div>
 </header>
 <content>
-    <div class="password-block password-wrapper" [innerHTML]="password | colorPassword" appFlexCopy></div>
+    <div class="password-block password-wrapper" [innerHTML]="password | colorPassword" appSelectCopy></div>
     <div class="box list">
         <div class="box-content single-line">
             <a class="box-content-row text-primary" href="#" appStopClick appBlurClick
diff --git a/src/popup/scss/box.scss b/src/popup/scss/box.scss
index 3d2fbde283..b706260fb9 100644
--- a/src/popup/scss/box.scss
+++ b/src/popup/scss/box.scss
@@ -225,6 +225,7 @@
 
     .row-main {
         flex-grow: 1;
+        min-width: 0;
     }
 
     &.box-content-row-flex, .box-content-row-flex, &.box-content-row-checkbox,
diff --git a/src/popup/scss/misc.scss b/src/popup/scss/misc.scss
index d8f210d421..6f87c1c0a3 100644
--- a/src/popup/scss/misc.scss
+++ b/src/popup/scss/misc.scss
@@ -146,12 +146,8 @@ p.lead {
 }
 
 .password-wrapper {
-    display: flex !important;
-    flex-wrap: wrap;
-
-    span {
-        white-space: pre;
-    }
+    word-break: break-all;
+    white-space: pre-wrap;
 }
 
 .password-number {
diff --git a/src/popup/scss/pages.scss b/src/popup/scss/pages.scss
index 4b4f779fb3..713cf2d09d 100644
--- a/src/popup/scss/pages.scss
+++ b/src/popup/scss/pages.scss
@@ -12,11 +12,6 @@ app-password-generator .password-block {
     font-size: $font-size-large;
     font-family: $font-family-monospace;
     text-align: center;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
     margin: 20px;
 }
 
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html
index c2c6a4662e..861c2341ea 100644
--- a/src/popup/vault/view.component.html
+++ b/src/popup/vault/view.component.html
@@ -36,9 +36,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" appSelectCopy>
                             {{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">