diff --git a/html/includes/hostbox.inc.php b/html/includes/hostbox.inc.php
index f90e7b9ab..8e91369c7 100644
--- a/html/includes/hostbox.inc.php
+++ b/html/includes/hostbox.inc.php
@@ -32,7 +32,7 @@ $port_count   = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE `device_id` = ?"
 $sensor_count = dbFetchCell("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = ?", array($device['device_id']));
 
 echo('  <tr class="'.$class.'" bgcolor="' . $bg . '" onmouseover="this.style.backgroundColor=\'#fdd\';" onmouseout="this.style.backgroundColor=\'' . $bg . '\';"
-          onclick="location.href=\'device/'.$device['device_id'].'/\'" style="cursor: pointer;">
+          onclick="location.href=\'device/device='.$device['device_id'].'/\'" style="cursor: pointer;">
           <td width="40" align="center" valign="middle">' . $image . '</td>
           <td width="300"><span style="font-size: 15px;">' . generate_device_link($device) . '</span>
           <br />' . $device['sysName'] . '</td>'
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 6227b83fa..aaf03e58f 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -248,7 +248,7 @@ if($format == "graph")
         $graph_type = "device_".$subformat;
 
         echo("<div style='display: block; padding: 1px; margin: 2px; min-width: 393px; max-width:393px; min-height:170px; max-height:170px; text-align: center; float: left; background-color: #f5f5f5;'>
-        <a href='device/".$device['device_id']."/' onmouseover=\"return overlib('\
+        <a href='device/device=".$device['device_id']."/' onmouseover=\"return overlib('\
         <div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$interface['ifDescr']."</div>\
         <img src=\'graph.php?type=$graph_type&amp;id=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=450&amp;height=150&amp;title=yes\'>\
         ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\"  >".