diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index caf590723..f081808a3 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -18,9 +18,10 @@ Added:
Changed:
+- Selection in feed list is now single.
+- Keyboard navigation to "next/previous" item in feed list is now recursively hybrid.
-
2.0.0.0
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index 53c576216..77bf9eabc 100755
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -460,6 +460,10 @@ void FeedsView::updateCountsOfParticularFeed(FeedsModelFeed *feed,
}
void FeedsView::selectNextItem() {
+ if (!isExpanded(currentIndex())) {
+ expand(currentIndex());
+ }
+
QModelIndex index_next = moveCursor(QAbstractItemView::MoveDown, Qt::NoModifier);
if (index_next.isValid()) {
@@ -471,6 +475,12 @@ void FeedsView::selectNextItem() {
void FeedsView::selectPreviousItem() {
QModelIndex index_previous = moveCursor(QAbstractItemView::MoveUp, Qt::NoModifier);
+ if (!isExpanded(index_previous)) {
+ expand(index_previous);
+ }
+
+ index_previous = moveCursor(QAbstractItemView::MoveUp, Qt::NoModifier);
+
if (index_previous.isValid()) {
setCurrentIndex(index_previous);
selectionModel()->select(index_previous, QItemSelectionModel::Select | QItemSelectionModel::Rows);