diff --git a/backend.php b/backend.php
index c1fc6020c..419d1b98e 100644
--- a/backend.php
+++ b/backend.php
@@ -489,6 +489,10 @@
 			$view_query_part = " unread = true AND ";
 		}
 
+		if ($view_mode == "Unread or Starred") {
+			$view_query_part = " (unread = true OR marked = true) AND ";
+		}
+
 /*		$result = db_query($link, "SELECT count(id) AS total_entries 
 			FROM ttrss_entries WHERE 
 			$search_query_part
diff --git a/tt-rss.php b/tt-rss.php
index cc48439f4..0bf146c1e 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -90,6 +90,7 @@
 			<option>All Articles</option>
 			<option>Starred</option>
 			<option selected>Unread</option>
+			<option>Unread or Starred</option>
 		</select>
 
 		&nbsp;Limit: