diff --git a/daemon/manager.rs b/daemon/manager.rs
index e6f5366..788125e 100644
--- a/daemon/manager.rs
+++ b/daemon/manager.rs
@@ -394,8 +394,11 @@ impl NiriTag {
         tag_rx: channel::Receiver<TagCmd>,
         fullstate_rx: channel::Receiver<channel::Sender<HashMap<u8, TagState>>>,
     ) -> Result<()> {
-        // base tag is always visible
+        // prepopulate tags
         self.tags.insert(0, true);
+        (1..=self.config.prepopulate).for_each(|i| {
+            self.tags.insert(i, true);
+        });
 
         loop {
             let recvd: Receivable = future::or(