diff --git a/application/controllers/HostgroupController.php b/application/controllers/HostgroupController.php
index 5d8b0a67..552f18a5 100644
--- a/application/controllers/HostgroupController.php
+++ b/application/controllers/HostgroupController.php
@@ -118,7 +118,11 @@ class HostgroupController extends Controller
         $this->addControl($limitControl);
         $this->addControl($viewModeSwitcher);
         $this->addControl($searchBar);
-        $continueWith = $this->createContinueWith(Links::hostsDetails(), $searchBar);
+        $continueWith = $this->createContinueWith(
+            Links::hostsDetails()
+                ->setFilter(Filter::equal('hostgroup.name', $hostgroup->name)),
+            $searchBar
+        );
 
         $this->addContent($hostList);
 
diff --git a/application/controllers/ServicegroupController.php b/application/controllers/ServicegroupController.php
index 520f8318..3a022bed 100644
--- a/application/controllers/ServicegroupController.php
+++ b/application/controllers/ServicegroupController.php
@@ -125,7 +125,11 @@ class ServicegroupController extends Controller
         $this->addControl($limitControl);
         $this->addControl($viewModeSwitcher);
         $this->addControl($searchBar);
-        $continueWith = $this->createContinueWith(Links::servicesDetails(), $searchBar);
+        $continueWith = $this->createContinueWith(
+            Links::servicesDetails()
+                ->setFilter(Filter::equal('servicegroup.name', $servicegroup->name)),
+            $searchBar
+        );
 
         $this->addContent($serviceList);