diff --git a/gradle.properties b/gradle.properties
index 7311015f..fa4bfe01 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,6 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 android.defaults.buildfeatures.buildconfig=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-compose.version=1.6.0-rc02
+compose.version=1.6.0-dev1440
 kotlin.version=1.9.22
 multiplatform.version=1.9.22
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
index aed3661c..2e25668b 100644
--- a/src/main/kotlin/Main.kt
+++ b/src/main/kotlin/Main.kt
@@ -1091,9 +1091,9 @@ fun App()
                                             globalfrndstoreunreadmsgs.try_clear_unread_per_friend_message_count(contacts.selectedContactPubkey)
                                         }
                                         ChatAppWithScaffold(focusRequester = focusRequester, contactList = contacts, ui_scale = ui_scale)
-                                        //LaunchedEffect(contacts.selectedContactPubkey) {
-                                        //    focusRequester.requestFocus()
-                                        //}
+                                        LaunchedEffect(contacts.selectedContactPubkey) {
+                                            focusRequester.requestFocus()
+                                        }
                                     }
                                 }
                             }
@@ -1136,9 +1136,9 @@ fun App()
                                             globalgrpstoreunreadmsgs.try_clear_unread_per_group_message_count(groups.selectedGroupId)
                                         }
                                         GroupAppWithScaffold(focusRequester = groupfocusRequester, groupList = groups, ui_scale = ui_scale)
-                                        //LaunchedEffect(groups.selectedGroupId) {
-                                        //    groupfocusRequester.requestFocus()
-                                        //}
+                                        LaunchedEffect(groups.selectedGroupId) {
+                                            groupfocusRequester.requestFocus()
+                                        }
                                     }
                                 }
                             }