diff --git a/tests/t6010-completion-contexts.sh b/tests/t6010-completion-contexts.sh
index f6a0d9d..5059d17 100755
--- a/tests/t6010-completion-contexts.sh
+++ b/tests/t6010-completion-contexts.sh
@@ -12,9 +12,16 @@ cat > todo.txt <<EOF
 notice the sunflowers +sunflowers @outside @garden +shared +landscape
 stop
 EOF
+cat > done.txt <<EOF
+x 2012-02-21 +herbs @oriental buy spices
+x 2012-02-21 +slack @home watch tv
+EOF
 test_todo_completion 'all contexts' 'todo.sh list @' '@garden @outdoor @outside'
 test_todo_completion 'contexts beginning with o' 'todo.sh list @o' '@outdoor @outside'
 test_todo_completion 'contexts beginning with outs' 'todo.sh list @outs' '@outside'
 test_todo_completion 'contexts beginning with x' 'todo.sh list @x' ''
 
+test_todo_completion 'contexts from done tasks beginning with h' 'todo.sh list @h' '@home'
+test_todo_completion 'contexts from done tasks beginning with or' 'todo.sh list @or' '@oriental'
+
 test_done
diff --git a/tests/t6020-completion-projects.sh b/tests/t6020-completion-projects.sh
index fd5c830..acbfbcb 100755
--- a/tests/t6020-completion-projects.sh
+++ b/tests/t6020-completion-projects.sh
@@ -12,9 +12,16 @@ cat > todo.txt <<EOF
 notice the sunflowers +sunflowers @outside @garden +shared +landscape
 stop
 EOF
+cat > done.txt <<EOF
+x 2012-02-21 +herbs @oriental buy spices
+x 2012-02-21 +slack @home watch tv
+EOF
 test_todo_completion 'all projects' 'todo.sh list +' '+landscape +roses +shared +sunflowers'
 test_todo_completion 'projects beginning with s' 'todo.sh list +s' '+shared +sunflowers'
 test_todo_completion 'projects beginning with ro' 'todo.sh list +ro' '+roses'
 test_todo_completion 'projects beginning with x' 'todo.sh list +x' ''
 
+test_todo_completion 'projects from done tasks beginning with h' 'todo.sh list +h' '+herbs'
+test_todo_completion 'projects from done tasks beginning with sl' 'todo.sh list +sl' '+slack'
+
 test_done
diff --git a/todo_completion b/todo_completion
index faf91a7..df1fd07 100644
--- a/todo_completion
+++ b/todo_completion
@@ -35,8 +35,18 @@ _todo()
                 completions=$(TODOTXT_VERBOSE=0 todo.sh command listfile);;
             -*) completions="$allCommands $OPTS";;
             *)  case "$cur" in
-                    +*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listproj);;
-                    @*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listcon);;
+                    +*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listproj)
+                        COMPREPLY=( $( compgen -W "$completions" -- $cur ))
+                        [ ${#COMPREPLY[@]} -gt 0 ] && return 0
+                        # Fall back to projects extracted from done tasks.
+                        completions=$(TODOTXT_VERBOSE=0 TODOTXT_SOURCEVAR=\$DONE_FILE todo.sh command listproj)
+                        ;;
+                    @*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listcon)
+                        COMPREPLY=( $( compgen -W "$completions" -- $cur ))
+                        [ ${#COMPREPLY[@]} -gt 0 ] && return 0
+                        # Fall back to contexts extracted from done tasks.
+                        completions=$(TODOTXT_VERBOSE=0 TODOTXT_SOURCEVAR=\$DONE_FILE todo.sh command listcon)
+                        ;;
                     *)  if [[ "$cur" =~ ^[0-9]+$ ]]; then
                             # Remove the (padded) task number; we prepend the
                             # user-provided $cur instead.