diff --git a/src/qml/FeedListDelegate.qml b/src/qml/FeedListDelegate.qml
index 303d5527..766acce9 100644
--- a/src/qml/FeedListDelegate.qml
+++ b/src/qml/FeedListDelegate.qml
@@ -33,6 +33,8 @@ Controls.ItemDelegate {
 
     onClicked: {
         lastFeed = feed.url
+        if (pageStack.depth >  1)
+            pageStack.pop();
         pageStack.push("qrc:/EntryListPage.qml", {"feed": feed})
     }
     Keys.onReturnPressed: clicked()
diff --git a/src/qml/GenericEntryDelegate.qml b/src/qml/GenericEntryDelegate.qml
index 3f853e5a..d120f214 100644
--- a/src/qml/GenericEntryDelegate.qml
+++ b/src/qml/GenericEntryDelegate.qml
@@ -182,7 +182,9 @@ Kirigami.SwipeListItem {
         if (isQueue || isDownloads) {
             lastEntry = entry.id;
         }
-        pageStack.push("qrc:/EntryPage.qml", {"entry": entry})
+        if (pageStack.depth > (currentPage === "FeedListPage" ? 2 : 1))
+            pageStack.pop();
+        pageStack.push("qrc:/EntryPage.qml", {"entry": entry});
     }
 
     actions: [