diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index e8d39c7c3..3b17e1b63 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -102,13 +102,23 @@ foreach ($services as $service):
         <?php endif ?>
 
       <?php if ($service->service_icon_image && ! preg_match('/[\'"]/', $service->service_icon_image)): ?>
-      <?= $this->icon($this->resolveMacros($service->service_icon_image, $service)) ?>
+        <?= $this->icon($this->resolveMacros($service->service_icon_image, $service)) ?>
       <?php endif ?>
-<a href="<?= $serviceLink ?>"><?= $this->escape($service->service_display_name) ?></a><?php if ($this->showHost): ?> on <a href="<?= $hostLink ?>"><?= $this->escape($service->host_display_name) ?>
-<?php if ($service->host_state != 0): ?>
-  (<?= Host::getStateText($service->host_state, true); ?>)
-<?php endif ?>
-</a><?php endif ?><br />
+        <?= $this->qlink(
+          $service->service_display_name,
+          $serviceLink,
+          null,
+          array('title' => sprintf(
+            $this->translate('Show detailed information for service %s on host %s'),
+            $service->service_display_name,
+            $service->host_display_name
+          ))
+        ); ?><?php if ($this->showHost): ?> on <?= $this->qlink(
+          $service->host_display_name . ($service->host_state != 0 ? ' (' . Host::getStateText($service->host_state, true) . ')' : ''),
+          $hostLink,
+          null,
+          array('title' => sprintf($this->translate('Show detailed information for host %s'), $service->host_display_name))
+        ); ?><?php endif ?><br>
         <p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)); ?></p>
       </td>
 <?php foreach($this->extraColumns as $col): ?>