diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 7618fe00df7..f11d84d5822 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -173,7 +173,8 @@
             <div class="box-content">
                 <div class="box-content-row" *ngIf="cipher.type === cipherType.Login">
                     <label for="loginTotp">{{'authenticatorKeyTotp' | i18n}}</label>
-                    <input id="loginTotp" type="text" name="Login.Totp" [(ngModel)]="cipher.login.totp">
+                    <input id="loginTotp" type="text" name="Login.Totp" class="monospaced"
+                           [(ngModel)]="cipher.login.totp">
                 </div>
                 <div class="box-content-row">
                     <label for="folder">{{'folder' | i18n}}</label>
diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html
index b56847b9d48..9fbf39020ee 100644
--- a/src/app/vault/attachments.component.html
+++ b/src/app/vault/attachments.component.html
@@ -2,23 +2,21 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-body">
-                <div class="box" *ngIf="cipher">
+                <div class="box" *ngIf="cipher && cipher.hasAttachments">
                     <div class="box-header">
                         {{'attachments' | i18n}}
                     </div>
-                    <div class="box-content">
-                        <div *ngIf="cipher.hasAttachments">
-                            <div class="box-content-row box-content-row-flex" *ngFor="let a of cipher.attachments">
-                                <div class="row-main">
-                                    {{a.fileName}}
-                                </div>
-                                <small class="row-sub-label">{{a.sizeName}}</small>
-                                <div class="action-buttons no-pad">
-                                    <a class="row-btn" href="#" appStopClick appBlurClick title="{{'delete' | i18n}}"
-                                       (click)="delete(a)">
-                                        <i class="fa fa-lg fa-trash-o"></i>
-                                    </a>
-                                </div>
+                    <div class="box-content no-hover">
+                        <div class="box-content-row box-content-row-flex" *ngFor="let a of cipher.attachments">
+                            <div class="row-main">
+                                {{a.fileName}}
+                            </div>
+                            <small class="row-sub-label">{{a.sizeName}}</small>
+                            <div class="action-buttons no-pad">
+                                <a class="row-btn" href="#" appStopClick appBlurClick title="{{'delete' | i18n}}"
+                                   (click)="delete(a)">
+                                    <i class="fa fa-lg fa-trash-o"></i>
+                                </a>
                             </div>
                         </div>
                     </div>
@@ -27,7 +25,7 @@
                     <div class="box-header">
                         {{'newAttachment' | i18n}}
                     </div>
-                    <div class="box-content">
+                    <div class="box-content no-hover">
                         <div class="box-content-row">
                             <label for="file">{{'file' | i18n}}</label>
                             <input type="file" id="file" name="file">
diff --git a/src/scss/box.scss b/src/scss/box.scss
index a250dddbf4a..3b555057fe8 100644
--- a/src/scss/box.scss
+++ b/src/scss/box.scss
@@ -212,6 +212,12 @@
             padding-top: 5px;
             padding-bottom: 5px;
         }
+
+        &.no-hover .box-content-row, .box-content-row.no-hover {
+            &:hover, &:focus {
+                background-color: initial;
+            }
+        }
     }
 
     .box-footer {
diff --git a/src/scss/misc.scss b/src/scss/misc.scss
index 70bf0344e3e..2c5eaa58b5b 100644
--- a/src/scss/misc.scss
+++ b/src/scss/misc.scss
@@ -81,6 +81,10 @@
     font-size: $font-size-large;
     word-break: break-all;
     font-family: $font-family-monospace;
+    min-height: 60px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     text-align: center;
 
     .modal-body & {