diff --git a/src/session.rs b/src/session.rs
index ba4f5f7..b57a67a 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -624,17 +624,23 @@ async fn swap_prev(session: &Arc<Mutex<Session>>) -> Result<()> {
 }
 
 async fn swap_as_main(session: &Arc<Mutex<Session>>, n: u32) -> Result<()> {
-    let (wins, tiles) = {
+    let (wins, tiles, prev_leader) = {
         let mut g = session.lock().await;
         if n < 2 || n as usize > g.slots.len() {
             return Ok(());
         }
+        // Swap vec positions so the new leader's window sits at index 0
+        // (the "main" tile for layout purposes). Do NOT renumber slot
+        // IDs: a slot ID identifies a character (and therefore a
+        // per-character assist/follow key), while vec position only
+        // identifies which physical tile the window currently occupies.
+        // Mixing the two was Bug #11 -- swapping then renumbering made
+        // every per-character macro target a different character than
+        // before.
         g.slots.swap(0, n as usize - 1);
-        for (i, (id, _)) in g.slots.iter_mut().enumerate() {
-            *id = i as u32 + 1;
-        }
-        g.engine.set_leader(1);
-        (g.slots.clone(), g.engine.profile.layout.slots.clone())
+        let prev = g.engine.leader_slot;
+        g.engine.set_leader(n);
+        (g.slots.clone(), g.engine.profile.layout.slots.clone(), prev)
     };
     if !tiles.is_empty() {
         crate::layout::apply(&tiles, &wins).await?;
@@ -642,9 +648,11 @@ async fn swap_as_main(session: &Arc<Mutex<Session>>, n: u32) -> Result<()> {
     if let Some((_, c)) = wins.first() {
         hypr::focus_window(&c.address_selector()).await.ok();
     }
-    hypr::notify(&format!("main is slot 1 (was {n})"))
-        .await
-        .ok();
+    hypr::notify(&format!(
+        "main is slot {n} (was {prev_leader})"
+    ))
+    .await
+    .ok();
     Ok(())
 }