diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 12a4f96fb6..0ac89a2c87 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -886,7 +886,7 @@
     "message": "If a login form is detected, automatically perform an auto-fill when the web page loads."
   },
   "enableAutoTotpCopyOnAutoFill": {
-    "message": "Enable Copy to Clipboard of TOTP"
+    "message": "Copy TOTP to clipboard after auto-fill"
   },
   "experimentalFeature": {
     "message": "This is currently an experimental feature. Use at your own risk."
diff --git a/src/popup/scss/box.scss b/src/popup/scss/box.scss
index 8ef64b6b76..8ae0842d66 100644
--- a/src/popup/scss/box.scss
+++ b/src/popup/scss/box.scss
@@ -10,8 +10,10 @@
     }
 
     .box {
-        padding-left: 15px;
-        padding-bottom: 5px;
+        width: calc(100% - 15px);
+        margin-left: 15px;
+        margin-bottom: 5px;
+        border-left: 1px solid #000000;
     }
 
     .box-header {
diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index a71c5f6cfb..4ab9f5b4e4 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -255,13 +255,12 @@ export default class AutofillService implements AutofillServiceInterface {
         }
 
         const copyTotpOnAutoFill = await this.totpService.isAutoCopyOnAutoFillEnabled();
-        const enableAutoFill = await this.totpService.isAutoCopyEnabled();
-        const shouldCopyTotp = copyTotpOnAutoFill && enableAutoFill;
+        const shouldCopyTotp = fromCommand || copyTotpOnAutoFill;
 
         const totpCode = await this.doAutoFill({
             cipher: cipher,
             pageDetails: pageDetails,
-            skipTotp: !fromCommand && !shouldCopyTotp,
+            skipTotp: !shouldCopyTotp,
             skipLastUsed: !fromCommand,
             skipUsernameOnlyFill: !fromCommand,
             onlyEmptyFields: !fromCommand,