diff --git a/tracks/app/controllers/todos_controller.rb b/tracks/app/controllers/todos_controller.rb
index a334e189..89fe11a4 100644
--- a/tracks/app/controllers/todos_controller.rb
+++ b/tracks/app/controllers/todos_controller.rb
@@ -461,7 +461,11 @@ class TodosController < ApplicationController
             @todos = Todo.find(:all, :conditions => ['todos.user_id = ?', current_user.id], :include => [ :project, :context, :tags ])
 
             # Exclude hidden projects from the home page
-            @not_done_todos = Todo.find(:all, :conditions => ['todos.user_id = ? AND contexts.hide = ? AND (projects.state = ? OR todos.project_id IS NULL)', current_user.id, false, 'active'], :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", :include => [ :project, :context, :tags ])
+            @not_done_todos = Todo.find(:all, 
+              :conditions => ['todos.user_id = ? AND contexts.hide = ? AND (projects.state = ? OR todos.project_id IS NULL)', 
+                current_user.id, false, 'active'], 
+              :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", 
+              :include => [ :project, :context, :tags ])
           end
 
         end
@@ -475,8 +479,8 @@ class TodosController < ApplicationController
     
     # Exclude hidden projects from the home page
     @not_done_todos = Todo.find(:all, 
-      :conditions => ['todos.user_id = ? AND todos.state = ? AND contexts.hide = ?', 
-        current_user.id, 'active', false], 
+      :conditions => ['todos.user_id = ? AND todos.state = ? AND contexts.hide = ? AND (projects.state = ? OR todos.project_id IS NULL)', 
+        current_user.id, 'active', false, 'active'], 
       :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", 
       :include => [ :project, :context ])
   end