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 d44b4214e..d8c47b2a1 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -341,6 +341,7 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
                     break;
                 }
                 case REQUEST_CODE_DECRYPT_AND_VERIFY: {
+                    findViewById(R.id.progress_bar_label).setVisibility(View.GONE);
                     decryptAndVerify(data);
                     break;
                 }
@@ -374,6 +375,9 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
                     if (requestCode == REQUEST_CODE_DECRYPT_AND_VERIFY && os != null) {
                         try {
                             if (returnToCiphertextField) {
+                                findViewById(R.id.progress_bar).setVisibility(View.GONE);
+                                findViewById(R.id.progress_bar_label).setVisibility(View.GONE);
+
                                 boolean showPassword = settings.getBoolean("show_password", true);
 
                                 if (showPassword) {
@@ -447,6 +451,8 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
                 case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: {
                     Log.i("PgpHandler", "RESULT_CODE_USER_INTERACTION_REQUIRED");
 
+                    findViewById(R.id.progress_bar_label).setVisibility(View.VISIBLE);
+
                     PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
                     try {
                         PgpHandler.this.startIntentSenderForResult(pi.getIntentSender(),
@@ -483,6 +489,8 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
     public void decryptAndVerify(Intent data) {
         data.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
 
+        findViewById(R.id.progress_bar).setVisibility(View.VISIBLE);
+
         try {
             InputStream is = FileUtils.openInputStream(new File(getIntent().getExtras().getString("FILE_PATH")));
 
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 0c80c9ed6..b86005c21 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -39,6 +39,23 @@
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"/>
         </LinearLayout>
 
+        <ProgressBar
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:id="@+id/progress_bar"
+            android:layout_gravity="center_horizontal"
+            android:indeterminate="true"
+            android:visibility="gone"/>
+        <TextView
+            android:id="@+id/progress_bar_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="Authentication Required"
+            android:visibility="gone"/>
+
         <LinearLayout
             android:id="@+id/crypto_container"
             android:orientation="vertical"