diff --git a/src/app.rs b/src/app.rs
index 8b64d6a..90d2a91 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -2697,10 +2697,10 @@ impl TaskwarriorTuiApp {
     }
 
     pub fn update_completion_list(&mut self) {
+        self.completion_list.clear();
         match self.mode {
             AppMode::TaskModify | AppMode::TaskFilter | AppMode::TaskAnnotate | AppMode::TaskAdd | AppMode::TaskLog => {
                 let virtual_tags = self.task_report_table.virtual_tags.clone();
-                self.completion_list.clear();
                 for task in self.tasks.iter() {
                     if let Some(tags) = task.tags() {
                         for tag in tags {
diff --git a/src/completion.rs b/src/completion.rs
index e5ac1fd..378a26c 100644
--- a/src/completion.rs
+++ b/src/completion.rs
@@ -32,8 +32,8 @@ pub fn get_start_word_under_cursor(line: &str, cursor_pos: usize) -> usize {
 }
 
 pub struct TaskwarriorTuiCompletionHelper {
-    candidates: Vec<String>,
-    completer: rustyline::completion::FilenameCompleter,
+    pub candidates: Vec<String>,
+    pub completer: rustyline::completion::FilenameCompleter,
 }
 
 impl Completer for TaskwarriorTuiCompletionHelper {
@@ -167,7 +167,7 @@ impl CompletionList {
     }
 
     pub fn is_empty(&self) -> bool {
-        self.helper.candidates.is_empty()
+        self.candidates().is_empty()
     }
 
     pub fn candidates(&self) -> Vec<Pair> {