diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt
index 7dcfed8e42..3dcebdd360 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt
@@ -134,11 +134,17 @@ fun GeneratorScreen(
             }
         }
 
-    val passwordHandlers = PasswordHandlers.create(viewModel = viewModel)
+    val passwordHandlers = remember(viewModel) {
+        PasswordHandlers.create(viewModel = viewModel)
+    }
 
-    val passphraseHandlers = PassphraseHandlers.create(viewModel = viewModel)
+    val passphraseHandlers = remember(viewModel) {
+        PassphraseHandlers.create(viewModel = viewModel)
+    }
 
-    val plusAddressedEmailHandlers = PlusAddressedEmailHandlers.create(viewModel = viewModel)
+    val plusAddressedEmailHandlers = remember(viewModel) {
+        PlusAddressedEmailHandlers.create(viewModel = viewModel)
+    }
 
     val scrollBehavior =
         TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState())