diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68db6e4a8..4142ce745 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 -   Introduce a new opt-in PGP backend powered by [PGPainless](https://github.com/pgpainless/pgpainless) that does not require OpenKeychain
 -   Add the ability to run garbage collection on the internal Git repository
 -   Introduce crash reporting backed by Sentry
+-   TOTP field now shows the remaining time for which it is valid
 
 ### Fixed
 
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
index c6fda8441..77abde2ae 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
@@ -208,6 +208,7 @@ class DecryptActivity : BasePgpActivity(), OpenPgpServiceConnection.OnBound {
             val adapter =
               FieldItemAdapter(items, showPassword) { text -> copyTextToClipboard(text) }
             binding.recyclerView.adapter = adapter
+            binding.recyclerView.itemAnimator = null
 
             if (entry.hasTotp()) {
               entry.totp.onEach(adapter::updateOTPCode).launchIn(lifecycleScope)
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt
index 21cd42aa7..424d5c461 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt
@@ -196,6 +196,7 @@ class DecryptActivityV2 : BasePgpActivity() {
 
       val adapter = FieldItemAdapter(items, showPassword) { text -> copyTextToClipboard(text) }
       binding.recyclerView.adapter = adapter
+      binding.recyclerView.itemAnimator = null
 
       if (entry.hasTotp()) {
         entry.totp.onEach(adapter::updateOTPCode).launchIn(lifecycleScope)