diff --git a/lib/functions/output/function.buildNavigation.php b/lib/functions/output/function.buildNavigation.php
index a9a6e879..a429b53f 100644
--- a/lib/functions/output/function.buildNavigation.php
+++ b/lib/functions/output/function.buildNavigation.php
@@ -58,7 +58,9 @@ function buildNavigation($navigation, $userinfo) {
 						}
 
 						$active = '';
-						if (isset($_GET['page']) && substr_count($element['url'], "page=" . $_GET['page']) > 0 && substr_count($element['url'], basename($_SERVER["SCRIPT_FILENAME"])) > 0) {
+						if (isset($_GET['page']) && substr_count($element['url'], "page=" . $_GET['page']) > 0 && substr_count($element['url'], basename($_SERVER["SCRIPT_FILENAME"])) > 0 && isset($_GET['action']) && substr_count($element['url'], "action=" . $_GET['action']) > 0) {
+							$active = ' active';
+						} elseif (isset($_GET['page']) && substr_count($element['url'], "page=" . $_GET['page']) > 0 && substr_count($element['url'], basename($_SERVER["SCRIPT_FILENAME"])) > 0 && substr_count($element['url'], "action=") == 0 && !isset($_GET['action'])) {
 							$active = ' active';
 						}