diff --git a/assets/scripts/app/models/repo.coffee b/assets/scripts/app/models/repo.coffee
index a26d093c..aa8c1e99 100644
--- a/assets/scripts/app/models/repo.coffee
+++ b/assets/scripts/app/models/repo.coffee
@@ -108,17 +108,12 @@ require 'travis/model'
   ).property('_lastBuildDuration', 'lastBuildStartedAt', 'lastBuildFinishedAt')
 
   sortOrder: (->
-    # this is prepared for ascending sort
-    if Ember.isNone(@get('lastBuildFinishedAt')) && @get('lastBuildStartedAt')
-      # if a build is running, it should be at the beginning
-      0
-    else if lastBuildStartedAt = @get('lastBuildStartedAt')
-      # if it's not running, but was already run, put newest builds first
-      new Date('9999').getTime() - Date.parse(lastBuildStartedAt)
+    # cuz sortAscending seems buggy when set to false
+    if lastBuildFinishedAt = @get('lastBuildFinishedAt')
+      - new Date(lastBuildFinishedAt).getTime()
     else
-      # if it's not started nor it was ran before, sort with newest id first
-      new Date('9999').getTime() - @get('id')
-  ).property('lastBuildFinishedAt', 'id', 'lastBuildStartedAt')
+      - new Date('9999').getTime() - parseInt(@get('lastBuildId'))
+  ).property('lastBuildFinishedAt', 'lastBuildId')
 
   stats: (->
     if @get('slug')