diff --git a/src/app/commoncomponents/ListSelectionView.qml b/src/app/commoncomponents/ListSelectionView.qml
index 186d20f5..cdacb464 100644
--- a/src/app/commoncomponents/ListSelectionView.qml
+++ b/src/app/commoncomponents/ListSelectionView.qml
@@ -45,7 +45,7 @@ DualPaneView {
     function selectIndex(index) { viewNode.index = index }
 
     // Override this predicate if needed.
-    property bool hasValidSelection: viewNode.index >= 0
+    property bool hasValidSelection: viewNode.index >= -1
     onHasValidSelectionChanged: isSinglePaneChangedHandler()
 
     // Override BaseView.dismiss with some selection logic.
diff --git a/src/app/settingsview/SettingsSidePanel.qml b/src/app/settingsview/SettingsSidePanel.qml
index a71baf03..416e42ba 100644
--- a/src/app/settingsview/SettingsSidePanel.qml
+++ b/src/app/settingsview/SettingsSidePanel.qml
@@ -143,6 +143,7 @@ SidePanelBase {
     }
 
     function open(index) {
+        indexSelected(-1)
         indexSelected(index)
         root.currentIndex = index
     }