diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index d818ab71..b05542a3 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -1531,6 +1531,7 @@ void LibraryWindow::addFolderToCurrentIndex()
             QModelIndex newIndex = foldersModel->addFolderAtParent(newFolderName,currentIndex);
             foldersView->setCurrentIndex(foldersModelProxy->mapFromSource(newIndex));
             navigationController->loadFolderInfo(newIndex);
+            historyController->updateHistory(YACReaderLibrarySourceContainer(newIndex,YACReaderLibrarySourceContainer::Folder));
             //a new folder is always an empty folder
             showEmptyFolderView();
         }
diff --git a/YACReaderLibrary/yacreader_navigation_controller.cpp b/YACReaderLibrary/yacreader_navigation_controller.cpp
index 65b500de..dfd01e3b 100644
--- a/YACReaderLibrary/yacreader_navigation_controller.cpp
+++ b/YACReaderLibrary/yacreader_navigation_controller.cpp
@@ -43,9 +43,6 @@ void YACReaderNavigationController::selectedFolder(const QModelIndex &mi)
     }
 
     loadFolderInfo(modelIndex);
-
-    //if a folder is selected, listsView selection must be cleared
-    libraryWindow->listsView->clearSelection();
 }
 
 void YACReaderNavigationController::reselectCurrentFolder()
@@ -77,6 +74,9 @@ void YACReaderNavigationController::loadFolderInfo(const QModelIndex &modelIndex
     }
 
     libraryWindow->updateFoldersViewConextMenu(modelIndex);
+
+    //if a folder is selected, listsView selection must be cleared
+    libraryWindow->listsView->clearSelection();
 }
 
 void YACReaderNavigationController::loadListInfo(const QModelIndex &modelIndex)
@@ -95,6 +95,9 @@ void YACReaderNavigationController::loadListInfo(const QModelIndex &modelIndex)
         loadReadingListInfo(modelIndex);
         break;
     }
+
+    //if a list is selected, foldersView selection must be cleared
+    libraryWindow->foldersView->clearSelection();
 }
 
 void YACReaderNavigationController::loadSpecialListInfo(const QModelIndex &modelIndex)
@@ -185,9 +188,6 @@ void YACReaderNavigationController::selectedList(const QModelIndex &mi)
     }
 
     loadListInfo(modelIndex);
-
-    //if a list is selected, foldersView selection must be cleared
-    libraryWindow->foldersView->clearSelection();
 }
 
 void YACReaderNavigationController::reselectCurrentList()