diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 2bac3c2df..e567a3015 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -27,6 +27,8 @@ foreach (dbFetchRows("SELECT * FROM `devices`") as $device)
    $device_alerts++;
    $device_alert_sql .= " OR `device_id` = '" . $device['device_id'] . "'";
   }
+
+  $cache['devices'][$device['hostname']] = $device;
 }
 ?>
 
diff --git a/html/includes/print-vm.inc.php b/html/includes/print-vm.inc.php
index bc9b3e1cb..5f33f8e73 100644
--- a/html/includes/print-vm.inc.php
+++ b/html/includes/print-vm.inc.php
@@ -4,7 +4,16 @@ if (!is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $lis
 
 echo('<tr bgcolor="' . $bg_colour . '">');
 
-echo('<td class="list">' . $vm['vmwVmDisplayName'] . "</td>");
+echo('<td class="list">');
+
+if (array_search($vm['vmwVmDisplayName'],array_keys($cache['devices'])))
+{
+  echo(generate_device_link($cache['devices'][$vm['vmwVmDisplayName']]));
+} else {
+  echo $vm['vmwVmDisplayName'];
+}
+
+echo("</td>");
 echo('<td class="list">' . $vm['vmwVmState'] . "</td>");
 
 if ($vm['vmwVmGuestOS'] == "E: tools not installed")