diff --git a/client/ui/qml/Components/SelectLanguageDrawer.qml b/client/ui/qml/Components/SelectLanguageDrawer.qml
index a48515cc..d3ae7146 100644
--- a/client/ui/qml/Components/SelectLanguageDrawer.qml
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -63,6 +63,7 @@ DrawerType2 {
             clip: true
             interactive: true
 
+            property int selectedIndex: LanguageModel.currentLanguageIndex
             property bool isFocusable: true
 
             Keys.onTabPressed: {
@@ -90,7 +91,6 @@ DrawerType2 {
             }
 
             model: LanguageModel
-            currentIndex: LanguageModel.currentLanguageIndex
 
             ButtonGroup {
                 id: buttonGroup
@@ -185,10 +185,10 @@ DrawerType2 {
                         }
 
                         ButtonGroup.group: buttonGroup
-                        checked: listView.currentIndex === index
+                        checked: listView.selectedIndex === index
 
                         onClicked: {
-                            listView.currentIndex = index
+                            listView.selectedIndex = index
                             LanguageModel.changeLanguage(languageIndex)
                             root.closeTriggered()
                         }