diff --git a/poc-agent/src/tui.rs b/poc-agent/src/tui.rs
index 0507068..a616dd3 100644
--- a/poc-agent/src/tui.rs
+++ b/poc-agent/src/tui.rs
@@ -838,12 +838,17 @@ impl App {
                     // Count visible characters (skip zero-width and empty)
                     if !symbol.is_empty() {
                         if char_count == cursor_char_pos {
-                            // Found the cursor position
+                            // Found the cursor position - this is where the next char would go
                             cursor_x = x;
                             cursor_y = y;
                             break;
                         }
                         char_count += 1;
+                    } else if char_count == cursor_char_pos {
+                        // Empty cell but we've reached the cursor position
+                        cursor_x = x;
+                        cursor_y = y;
+                        break;
                     }
                 }
             }