diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
index 3b47bf662..d0174a9af 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
@@ -199,6 +199,15 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
                             return@executeApiAsync
                         }
 
+                        if (entry.password.isEmpty()) {
+                            crypto_password_show.visibility = View.GONE
+                            crypto_password_show_label.visibility = View.GONE
+                        } else {
+                            crypto_password_show.visibility = View.VISIBLE
+                            crypto_password_show_label.visibility = View.VISIBLE
+                            crypto_password_show.typeface = monoTypeface
+                            crypto_password_show.text = entry.password
+                        }
                         crypto_password_show.typeface = monoTypeface
                         crypto_password_show.text = entry.password
 
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 727b63764..1fde3b79e 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -67,6 +67,7 @@
                 android:layout_height="wrap_content">
 
                 <TextView
+                    android:id="@+id/crypto_password_show_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textStyle="bold"