diff --git a/src/Core/Pages/Vault/CipherAddEditPage.xaml.cs b/src/Core/Pages/Vault/CipherAddEditPage.xaml.cs
index 1ff0be66c..2aa659d1b 100644
--- a/src/Core/Pages/Vault/CipherAddEditPage.xaml.cs
+++ b/src/Core/Pages/Vault/CipherAddEditPage.xaml.cs
@@ -268,6 +268,14 @@ namespace Bit.App.Pages
                         {
                             await Navigation.PopModalAsync();
                             await _vm.UpdateTotpKeyAsync(key);
+
+#if IOS
+                            // HACK: To avoid a bug that incorrectly sets the TextColor when changing text
+                            // programatically we need to set it to null and back to the correct color
+                            // MAUI issue https://github.com/dotnet/maui/pull/20100
+                            _loginTotpEntry.TextColor = null;
+                            _loginTotpEntry.TextColor = ThemeManager.GetResourceColor("TextColor");
+#endif
                         }
                         catch (Exception ex)
                         {