diff --git a/html/pages/health/current.inc.php b/html/pages/health/current.inc.php
index 7140f31f07..edd88447c4 100644
--- a/html/pages/health/current.inc.php
+++ b/html/pages/health/current.inc.php
@@ -30,7 +30,7 @@ while($current = mysql_fetch_array($query))
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
   $weekly_current  = "graph.php?id=" . $current['sensor_id'] . "&type=".$graph_type."&from=$week&to=$now&width=500&height=150";
-  $current_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_current\'>', LEFT);\" onmouseout=\"return nd();\">
+  $current_popup = "<a href=\"graphs/" . $current['sensor_id'] . "/".$graph_type."/\" onmouseover=\"return overlib('<img src=\'$weekly_current\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $current['sensor_descr'] . "</a>";
 
   if($current['sensor_current'] >= $current['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
diff --git a/html/pages/health/fanspeeds.inc.php b/html/pages/health/fanspeeds.inc.php
index 2ac3f57ba6..470aa4b45d 100644
--- a/html/pages/health/fanspeeds.inc.php
+++ b/html/pages/health/fanspeeds.inc.php
@@ -29,7 +29,7 @@ while($fan = mysql_fetch_array($query))
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
   $weekly_fan  = "graph.php?id=" . $fan['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
-  $fan_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_fan\'>', LEFT);\" onmouseout=\"return nd();\">
+  $fan_popup = "<a href=\"graphs/" . $fan['sensor_id'] . "/".$graph_type."/\" onmouseover=\"return overlib('<img src=\'$weekly_fan\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $fan['sensor_descr'] . "</a>";
 
   if($fan['sensor_current'] <= $fan['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
diff --git a/html/pages/health/frequencies.inc.php b/html/pages/health/frequencies.inc.php
index 458bd53862..f4022135e5 100644
--- a/html/pages/health/frequencies.inc.php
+++ b/html/pages/health/frequencies.inc.php
@@ -29,7 +29,7 @@ while($freq = mysql_fetch_array($query))
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
   $weekly_freq  = "graph.php?id=" . $freq['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
-  $sensor_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_freq\'>', LEFT);\" onmouseout=\"return nd();\">
+  $sensor_popup = "<a href=\"graphs/" . $freq['sensor_id'] . "/".$graph_type."/\" onmouseover=\"return overlib('<img src=\'$weekly_freq\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $freq['sensor_descr'] . "</a>";
 
   if($freq['sensor_current'] >= $freq['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
diff --git a/html/pages/health/humidity.inc.php b/html/pages/health/humidity.inc.php
index f9371b9bb3..88b1d4d034 100644
--- a/html/pages/health/humidity.inc.php
+++ b/html/pages/health/humidity.inc.php
@@ -29,7 +29,7 @@ while($humidity = mysql_fetch_array($query))
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
   $weekly_humidity  = "graph.php?id=" . $humidity['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
-  $humidity_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_humidity\'>', LEFT);\" onmouseout=\"return nd();\">
+  $humidity_popup = "<a href=\"graphs/" . $humidity['sensor_id'] . "/".$graph_type."/\" onmouseover=\"return overlib('<img src=\'$weekly_humidity\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $humidity['sensor_descr'] . "</a>";
 
   $humidity['sensor_current'] = round($humidity['sensor_current'],1);
diff --git a/html/pages/health/temperatures.inc.php b/html/pages/health/temperatures.inc.php
index d9191ea77f..ec9c264b0b 100644
--- a/html/pages/health/temperatures.inc.php
+++ b/html/pages/health/temperatures.inc.php
@@ -29,7 +29,7 @@ while($temp = mysql_fetch_array($query))
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
   $weekly_temp  = "graph.php?id=" . $temp['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
-  $temp_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_temp\'>', LEFT);\" onmouseout=\"return nd();\">
+  $temp_popup = "<a href=\"graphs/" . $temp['sensor_id'] . "/".$graph_type."/\" onmouseover=\"return overlib('<img src=\'$weekly_temp\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $temp['sensor_descr'] . "</a>";
 
   $temp['sensor_current'] = round($temp['sensor_current'],1);
diff --git a/html/pages/health/voltages.inc.php b/html/pages/health/voltages.inc.php
index 70c7b8c9a2..1050c60628 100644
--- a/html/pages/health/voltages.inc.php
+++ b/html/pages/health/voltages.inc.php
@@ -29,7 +29,7 @@ while($volt = mysql_fetch_array($query))
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
   $weekly_volt  = "graph.php?id=" . $volt['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
-  $volt_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_volt\'>', LEFT);\" onmouseout=\"return nd();\">
+  $volt_popup = "<a href=\"graphs/" . $volt['sensor_id'] . "/".$graph_type."/\" onmouseover=\"return overlib('<img src=\'$weekly_volt\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $volt['sensor_descr'] . "</a>";
 
   if($volt['sensor_current'] >= $volt['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }