diff --git a/src/app.rs b/src/app.rs
index 4d9c7ce..928289c 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1120,6 +1120,7 @@ impl App {
             }
             6 => {
                 self.popup_list_indices = self.lists.iter()
+                    .filter(|l| !l.id.contains('-'))
                     .map(|l| (l.title.clone(), l.id.clone()))
                     .collect();
                 self.popup_list_selected = 0;
diff --git a/src/infrastructure/db.rs b/src/infrastructure/db.rs
index 1405ab7..424aaf3 100644
--- a/src/infrastructure/db.rs
+++ b/src/infrastructure/db.rs
@@ -336,6 +336,10 @@ impl Db {
             "UPDATE tasks SET list_id = ?1 WHERE list_id = ?2",
             params![new_id, old_id],
         )?;
+        conn.execute(
+            "UPDATE sync_queue SET list_id = ?1 WHERE list_id = ?2",
+            params![new_id, old_id],
+        )?;
         Ok(())
     }