diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6acbb9..d8276ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@ Procedure when bumping the version number:
 
 ## Unreleased
 
+### Fixed
+- Crash when drawing `widgets::Predrawn` with width 0
+
 ## v0.2.1 - 2024-01-05
 
 ### Added
diff --git a/src/buffer.rs b/src/buffer.rs
index 094a143..022145b 100644
--- a/src/buffer.rs
+++ b/src/buffer.rs
@@ -332,6 +332,9 @@ impl<'a> Iterator for Cells<'a> {
     type Item = (u16, u16, &'a Cell);
 
     fn next(&mut self) -> Option<Self::Item> {
+        if self.x >= self.buffer.size.width {
+            return None;
+        }
         if self.y >= self.buffer.size.height {
             return None;
         }