diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
index 0ad978870..609a81a76 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -310,7 +310,8 @@ class EntryEditActivity : LockingHideActivity(),
         val inflater = menuInflater
         inflater.inflate(R.menu.database_lock, menu)
         MenuUtil.contributionMenuInflater(inflater, menu)
-        inflater.inflate(R.menu.edit_entry, menu)
+        if (mDatabase?.allowOTP == true)
+            inflater.inflate(R.menu.entry_otp, menu)
 
         entryEditActivityEducation?.let {
             Handler().post { performedNextEducation(it) }
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
index 1cb8c505f..12f4b8150 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
@@ -120,6 +120,9 @@ class Database {
             pwDatabaseV4?.color = value
         }
 
+    val allowOTP: Boolean
+        get() = pwDatabaseV4 != null
+
     val version: String
         get() = pwDatabaseV3?.version ?: pwDatabaseV4?.version ?: "-"
 
diff --git a/app/src/main/res/menu/edit_entry.xml b/app/src/main/res/menu/entry_otp.xml
similarity index 100%
rename from app/src/main/res/menu/edit_entry.xml
rename to app/src/main/res/menu/entry_otp.xml