diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 2c07ca65..3043e97f 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -30,7 +30,9 @@ ListView {
         target: ServersModel
 
         function onCurrentlyProcessedServerIndexChanged() {
-            menuContent.checkCurrentItem()
+            if (ContainersModel.getDefaultContainer()) {
+                menuContent.checkCurrentItem()
+            }
         }
     }
 
@@ -76,9 +78,8 @@ ListView {
                     }
 
                     if (checked) {
-                        ServersModel.setDefaultContainer(proxyContainersModel.mapToSource(index))
-
                         containersDropDown.menuVisible = false
+                        ServersModel.setDefaultContainer(proxyContainersModel.mapToSource(index))
                     } else {
                         if (!isSupported && isInstalled) {
                             PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))