diff --git a/app/models/context.rb b/app/models/context.rb
index cc5f6253..2a797397 100644
--- a/app/models/context.rb
+++ b/app/models/context.rb
@@ -1,6 +1,7 @@
 class Context < ActiveRecord::Base
 
-  has_many :todos, :dependent => :delete_all, :include => :project, :order => "todos.completed_at DESC"
+  has_many :todos, :dependent => :delete_all, :include => :project,
+    :order => 'todos.due IS NULL, todos.due ASC, todos.created_at ASC'
   has_many :recurring_todos, :dependent => :delete_all
   belongs_to :user