diff --git a/html/pages/device/overview/temperatures.inc.php b/html/pages/device/overview/temperatures.inc.php
index cc1dc0a26..449bd9932 100644
--- a/html/pages/device/overview/temperatures.inc.php
+++ b/html/pages/device/overview/temperatures.inc.php
@@ -1,16 +1,15 @@
 <?php
 
 unset($temp_seperator);
-if(mysql_result(mysql_query("SELECT count(temp_id) from temperature WHERE device_id = '" . $device['device_id'] . "'"),0)) {
-  $total = mysql_result(mysql_query("SELECT count(temp_id) from temperature WHERE device_id = '" . $device['device_id'] . "'"),0);
+if($total = mysql_result(mysql_query("SELECT count(temp_id) from temperature WHERE device_id = '" . $device['device_id'] . "'"),0)) {
   $rows = round($total / 2,0);
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
   echo("<p style='padding: 0px 5px 5px;' class=sectionhead><img align='absmiddle' src='".$config['base_url']."/images/icons/temperature.png'> Temperatures</p>");
   $i = '1';
-  $temps = mysql_query("SELECT * FROM temperature WHERE device_id = '" . $device['device_id'] . "'");
-  echo("<table width=100% valign=top>");
-  echo("<tr><td width=50%>");
-  echo("<table width=100% cellspacing=0 cellpadding=2>");
+  $temps = mysql_query("SELECT * FROM temperature WHERE device_id = '" . $device['device_id'] . "' ORDER BY temp_index");
+  echo('<table width="100%" valign="top">');
+  echo('<tr><td width="50%">');
+  echo('<table width="100%" cellspacing="0" cellpadding="2">');
   while($temp = mysql_fetch_array($temps)) {
     if(is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }