diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 6382f9146..095aab9af 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -254,8 +254,11 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
             return;
         }
 
+        setTimer();
+
         ClipData clip = ClipData.newPlainText("pgp_handler_result_pm", decodedPassword);
         clipboard.setPrimaryClip(clip);
+
         try {
             showToast(this.getResources().getString(R.string.clipboard_beginning_toast_text)
                     + " " + Integer.parseInt(settings.getString("general_show_time", "45")) + " "
@@ -521,8 +524,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
                                             .setText(extraContent);
                                 }
 
-                                setTimer();
-
                                 if (settings.getBoolean("copy_on_decrypt", true)) {
                                     copyToClipBoard();
                                 }