diff --git a/Classes/Controller/OverviewController.php b/Classes/Controller/OverviewController.php
index 9edb1e09206e0a8594214fb932c2197344276ebe..119482456c1b015f30a5ebe5894c894a30f27c21 100644
--- a/Classes/Controller/OverviewController.php
+++ b/Classes/Controller/OverviewController.php
@@ -295,6 +295,9 @@ class OverviewController extends AbstractController {
 		if ($newsFilter['tag']) {
 			$tagIds = [(int) $newsFilter['tag']];
 		}
+		if ($newsFilter['category']) {
+			$categoryIds = [(int) $newsFilter['category']];
+		}
 		$news = $this->newsRepository->findAllSortedNewsByCategories(
 			$categoryIds, $newsLimitPerCategory, $offset, $sortBy, $tagIds, $startTime, $endTime, $sortDirection
 		);
@@ -336,7 +339,9 @@ class OverviewController extends AbstractController {
 		}
 
 		// remember selection of the filter values, if any
+		$selectedCategory = $this->categoryRepository->findByUid((int) $newsFilter['category']);
 		$selectedTag = $this->tagRepository->findByUid((int) $newsFilter['tag']);
+		$this->view->assign('selectedCategory', $selectedCategory);
 		$this->view->assign('selectedTag', $selectedTag);
 		$this->view->assign('tags', $tags);
 		$this->view->assign('categories', $categories);
@@ -454,6 +459,9 @@ class OverviewController extends AbstractController {
 		}
 
 		// Get all news by tags.
+		if ($newsFilter['tag']) {
+			$tagIds = [(int) $newsFilter['tag']];
+		}
 		$news = $this->newsRepository->findAllSortedNewsByCategories(
 			$categoryIds, $newsLimitPerTag, $offset, $sortBy, $tagIds, $startTime, $endTime, $sortDirection
 		);
@@ -496,8 +504,10 @@ class OverviewController extends AbstractController {
 		}
 
 		// remember selection of the filter values, if any
+		$selectedTag = $this->tagRepository->findByUid((int) $newsFilter['tag']);
 		$selectedCategory = $this->categoryRepository->findByUid((int) $newsFilter['category']);
 		$this->view->assign('selectedCategory', $selectedCategory);
+		$this->view->assign('selectedTag', $selectedTag);
 		$this->view->assign('tags', $tags);
 		$this->view->assign('categories', $categories);
 		$this->view->assign('numberOfPages', $numberOfPages);