diff --git a/puppetboard/static/js/tables.js b/puppetboard/static/js/tables.js
index 25c4434..a91d23b 100644
--- a/puppetboard/static/js/tables.js
+++ b/puppetboard/static/js/tables.js
@@ -11,7 +11,9 @@
   }
 
   $('thead th.date').data('sortBy', function(th, td, tablesort) {
-    return moment.utc(td.text()).unix();
+    var tdTime = new Date(td.text().replace("-", ""));
+    if(isNaN(tdTime)) return 0;
+    else return tdTime;
   });
 
   $('input.filter-table').parent('div').removeClass('hide');
diff --git a/puppetboard/templates/index.html b/puppetboard/templates/index.html
index 7e59e26..ec8f49b 100644
--- a/puppetboard/templates/index.html
+++ b/puppetboard/templates/index.html
@@ -87,7 +87,7 @@
           <tr>
             <th class="five wide">Status</th>
             <th class="five wide">Certname</th>
-            <th class="five wide default-sort">Report</th>
+            <th class="date five wide default-sort">Report</th>
             <th class="one wide"></th>
           </tr>
         </thead>
diff --git a/puppetboard/templates/nodes.html b/puppetboard/templates/nodes.html
index aefea6a..5301005 100644
--- a/puppetboard/templates/nodes.html
+++ b/puppetboard/templates/nodes.html
@@ -9,8 +9,8 @@
     <tr>
       <th>Status</th>
       <th class="default">Certname</th>
-      <th class="default-sort">Catalog</th>
-      <th>Report</th>
+      <th class="date default-sort">Catalog</th>
+      <th class="date">Report</th>
       <th>&nbsp;</th>
     </tr>
   </thead>