diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.android.kt
index 01614e09ea..160514521f 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.android.kt
@@ -20,11 +20,11 @@ actual fun ChatListNavLinkLayout(
   disabled: Boolean,
   selectedChat: State<Boolean>,
   nextChatSelected: State<Boolean>,
-  oneHandUI: State<Boolean>
+  oneHandUI: State<Boolean>?
 ) {
   var modifier = Modifier.fillMaxWidth()
 
-  if (oneHandUI.value) {
+  if (oneHandUI != null && oneHandUI.value) {
     modifier = modifier.scale(scaleX = 1f, scaleY = -1f)
   }
 
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt
index 5c6b81c664..f54e9edb90 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt
@@ -915,7 +915,7 @@ expect fun ChatListNavLinkLayout(
   disabled: Boolean,
   selectedChat: State<Boolean>,
   nextChatSelected: State<Boolean>,
-  oneHandUI: State<Boolean>
+  oneHandUI: State<Boolean>? = null
 )
 
 @Preview/*(
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactListNavView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactListNavView.kt
index b03a679ce8..3376bbc833 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactListNavView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactListNavView.kt
@@ -14,7 +14,7 @@ import chat.simplex.res.MR
 import kotlinx.coroutines.delay
 
 @Composable
-fun ContactListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>, oneHandUI: State<Boolean>) {
+fun ContactListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>) {
     val showMenu = remember { mutableStateOf(false) }
     val disabled = chatModel.chatRunning.value == false || chatModel.deletedChats.value.contains(chat.remoteHostId to chat.chatInfo.id)
     LaunchedEffect(chat.id) {
@@ -44,7 +44,6 @@ fun ContactListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>, oneHand
                 disabled,
                 selectedChat,
                 nextChatSelected,
-                oneHandUI
             )
         }
         is ChatInfo.ContactRequest -> {
@@ -73,7 +72,6 @@ fun ContactListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>, oneHand
                 disabled,
                 selectedChat,
                 nextChatSelected,
-                oneHandUI
             )
         }
         else -> {}
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactsView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactsView.kt
index 8388b83e7c..c7e2e4579e 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactsView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/contacts/ContactsView.kt
@@ -269,7 +269,6 @@ private fun ContactsList(
     contactTypes: List<ContactType>,
     contactListTitle: String ? = null
 ) {
-    val oneHandUI = remember { chatModel.controller.appPrefs.oneHandUI }
     val listState = rememberLazyListState(lazyListState.first, lazyListState.second)
     val searchText = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(
         TextFieldValue("")
@@ -334,7 +333,7 @@ private fun ContactsList(
                 }
             }
             SectionItemView(padding = PaddingValues(horizontal = DEFAULT_PADDING)) {
-                ContactListNavLinkView(chat, nextChatSelected, oneHandUI.state)
+                ContactListNavLinkView(chat, nextChatSelected)
             }
         }
     }
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.desktop.kt
index c7968d8160..1c4e40be47 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.desktop.kt
@@ -35,7 +35,7 @@ actual fun ChatListNavLinkLayout(
   disabled: Boolean,
   selectedChat: State<Boolean>,
   nextChatSelected: State<Boolean>,
-  oneHandUI: State<Boolean>
+  oneHandUI: State<Boolean>?,
 ) {
   var modifier = Modifier.fillMaxWidth()
   if (!disabled) modifier = modifier