diff --git a/application/controllers/HostgroupController.php b/application/controllers/HostgroupController.php
index 5d8b0a678..66fd357f5 100644
--- a/application/controllers/HostgroupController.php
+++ b/application/controllers/HostgroupController.php
@@ -73,7 +73,7 @@ public function indexAction(): Generator
             [
                 'host.display_name'                                          => t('Name'),
                 'host.state.severity desc,host.state.last_state_change desc' => t('Severity'),
-                'host.state.soft_state'                                      => t('Current State'),
+                'host.state.soft_state,host.display_name'                    => t('Current State'),
                 'host.state.last_state_change desc'                          => t('Last State Change')
             ]
         );
diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php
index 226e6db83..e612eaa7b 100644
--- a/application/controllers/HostsController.php
+++ b/application/controllers/HostsController.php
@@ -55,7 +55,7 @@ public function indexAction()
             [
                 'host.display_name'                                          => t('Name'),
                 'host.state.severity desc,host.state.last_state_change desc' => t('Severity'),
-                'host.state.soft_state'                                      => t('Current State'),
+                'host.state.soft_state,host.display_name'                    => t('Current State'),
                 'host.state.last_state_change desc'                          => t('Last State Change')
             ]
         );
diff --git a/application/controllers/ServicegroupController.php b/application/controllers/ServicegroupController.php
index 520f8318d..4e2bd7458 100644
--- a/application/controllers/ServicegroupController.php
+++ b/application/controllers/ServicegroupController.php
@@ -77,11 +77,11 @@ public function indexAction(): Generator
         $sortControl = $this->createSortControl(
             $services,
             [
-                'service.display_name'                                             => t('Name'),
-                'service.state.severity desc,service.state.last_state_change desc' => t('Severity'),
-                'service.state.soft_state'                                         => t('Current State'),
-                'service.state.last_state_change desc'                             => t('Last State Change'),
-                'host.display_name'                                                => t('Host')
+                'service.display_name, host.display_name'                           => t('Name'),
+                'service.state.severity desc,service.state.last_state_change desc'  => t('Severity'),
+                'service.state.soft_state, service.display_name, host.display_name' => t('Current State'),
+                'service.state.last_state_change desc'                              => t('Last State Change'),
+                'host.display_name, service.display_name'                           => t('Host')
             ]
         );
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php
index 04b930561..ea92fadd6 100644
--- a/application/controllers/ServicesController.php
+++ b/application/controllers/ServicesController.php
@@ -63,11 +63,11 @@ public function indexAction()
         $sortControl = $this->createSortControl(
             $services,
             [
-                'service.display_name'                                             => t('Name'),
-                'service.state.severity desc,service.state.last_state_change desc' => t('Severity'),
-                'service.state.soft_state'                                         => t('Current State'),
-                'service.state.last_state_change desc'                             => t('Last State Change'),
-                'host.display_name'                                                => t('Host')
+                'service.display_name, host.display_name'                           => t('Name'),
+                'service.state.severity desc,service.state.last_state_change desc'  => t('Severity'),
+                'service.state.soft_state, service.display_name, host.display_name' => t('Current State'),
+                'service.state.last_state_change desc'                              => t('Last State Change'),
+                'host.display_name, service.display_name'                           => t('Host')
             ]
         );
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);