diff --git a/auth/lib/ui/home_page.dart b/auth/lib/ui/home_page.dart
index 16136428ee..0f76dac047 100644
--- a/auth/lib/ui/home_page.dart
+++ b/auth/lib/ui/home_page.dart
@@ -90,8 +90,8 @@ class _HomePageState extends State<HomePage> {
   @override
   void initState() {
     super.initState();
-    _textController.addListener(_applyFilteringAndRefresh);
     _codeSortKey = PreferenceService.instance.codeSortKey();
+    _textController.addListener(_applyFilteringAndRefresh);
     _loadCodes();
     _streamSubscription = Bus.instance.on<CodesUpdatedEvent>().listen((event) {
       _loadCodes();
@@ -580,7 +580,7 @@ class _HomePageState extends State<HomePage> {
 
                   return ClipRect(
                     child: CodeWidget(
-                      key: ValueKey('${code.hashCode}_$newIndex_${_codeSortKey ?? ""}'),
+                      key: ValueKey('${code.hashCode}_${newIndex}_$_codeSortKey'),
                       code,
                       isCompactMode: isCompactMode,
                       sortKey: _codeSortKey,