diff --git a/YACReaderLibrary/yacreader_navigation_controller.cpp b/YACReaderLibrary/yacreader_navigation_controller.cpp
index 834bcdd1..87c2b93f 100644
--- a/YACReaderLibrary/yacreader_navigation_controller.cpp
+++ b/YACReaderLibrary/yacreader_navigation_controller.cpp
@@ -36,8 +36,8 @@ void YACReaderNavigationController::selectedFolder(const QModelIndex &mi)
 
     // when a folder is selected the search mode has to be reset
     if (libraryWindow->exitSearchMode()) {
-        libraryWindow->foldersView->scrollTo(mi, QAbstractItemView::PositionAtTop);
-        libraryWindow->foldersView->setCurrentIndex(mi);
+        libraryWindow->foldersView->scrollTo(modelIndex, QAbstractItemView::PositionAtTop);
+        libraryWindow->foldersView->setCurrentIndex(modelIndex);
     }
 
     loadFolderInfo(modelIndex);
@@ -262,9 +262,7 @@ void YACReaderNavigationController::loadPreviousStatus()
 
 void YACReaderNavigationController::setupConnections()
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     connect(libraryWindow->foldersView, &YACReaderTreeView::currentIndexChanged, this, &YACReaderNavigationController::selectedFolder);
-#endif
     connect(libraryWindow->foldersView, &YACReaderTreeView::clicked, this, &YACReaderNavigationController::selectedFolder);
     connect(libraryWindow->listsView, &QAbstractItemView::clicked, this, &YACReaderNavigationController::selectedList);
     connect(libraryWindow->historyController, &YACReaderHistoryController::modelIndexSelected, this, &YACReaderNavigationController::selectedIndexFromHistory);