diff --git a/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt b/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt
index 9fb20af24..29284f07d 100644
--- a/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt
+++ b/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt
@@ -262,6 +262,9 @@ class DecryptActivity : BasePGPActivity() {
       val items = arrayListOf<FieldItem>()
       if (!entry.password.isNullOrBlank()) {
         items.add(FieldItem.createPasswordField(entry.password!!))
+        if (settings.getBoolean(PreferenceKeys.COPY_ON_DECRYPT, false)) {
+          copyPasswordToClipboard(entry.password)
+        }
       }
 
       if (entry.hasTotp()) {