diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb478f87..fe149600 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -121,6 +121,10 @@
 ### Fixed
 
 * `REP`: wrong width of repeated multi-codepoint graphemes.
+* Incorrect surface commit after a configure event, under certain
+  conditions ([#2105][2105]).
+
+[2105]: https://codeberg.org/dnkl/foot/issues/2105
 
 
 ### Security
diff --git a/wayland.c b/wayland.c
index 368b3be7..37fefb29 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1134,7 +1134,7 @@ xdg_surface_configure(void *data, struct xdg_surface *xdg_surface,
     else
         term_visual_focus_out(term);
 
-    if (!resized) {
+    if (!resized && !term->render.pending.grid) {
         /*
          * If we didn't resize, we won't be committing a new surface
          * anytime soon. Some compositors require a commit in