diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 52184209f..31d685d2b 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -26,7 +26,7 @@
          data-icinga-multiselect-data="comment_id">
     <tbody>
     <?php foreach ($comments->peekAhead($this->compact) as $comment): ?>
-      <tr>
+      <tr href="<?=  $this->href('monitoring/comment/show', array('comment_id' => $comment->id)) ?>">
         <td class="icon-col">
           <?= $this->partial('partials/comment/comment-description.phtml', array('comment' => $comment)); ?>
         </td>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
index 03060eecd..5a250d213 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
@@ -2,28 +2,29 @@
 <?php if ($comment->objecttype === 'service'): ?>
     <?= $this->icon('service', $this->translate('Service')) ?> <?= $this->qlink(
         $this->escape($comment->host_display_name) . ': ' . $this->escape($comment->service_display_name),
-        'monitoring/comment/show',
-        array('comment_id' => $comment->id),
+        'monitoring/service/show',
+        array(
+            'host'    => $comment->host_name,
+            'service' => $comment->service_description
+        ),
         array(
             'title' => sprintf(
                 $this->translate('Show detailed information for this comment about service %s on host %s'),
                 $comment->service_display_name,
                 $comment->host_display_name
-            ),
-            'class' => 'rowaction'
+            )
         )
     ) ?>
 <?php else: ?>
     <?= $this->icon('host', $this->translate('Host')) ?> <?= $this->qlink(
         $this->escape($comment->host_display_name),
-        'monitoring/comment/show',
-        array('comment_id' => $comment->id),
+        'monitoring/host/show',
+        array('host' => $comment->host_name),
         array(
             'title' => sprintf(
                 $this->translate('Show detailed information for this comment about host %s'),
                 $comment->host_display_name
-            ),
-            'class' => 'rowaction'
+            )
         )
     ) ?>
 <?php endif ?>