diff --git a/src/renderer/Metal.zig b/src/renderer/Metal.zig
index c4ea43841..1ea85267b 100644
--- a/src/renderer/Metal.zig
+++ b/src/renderer/Metal.zig
@@ -37,6 +37,10 @@ surface_mailbox: apprt.surface.Mailbox,
 /// Current cell dimensions for this grid.
 cell_size: renderer.CellSize,
 
+/// Current screen size dimensions for this grid. This is set on the first
+/// resize event, and is not immediately available.
+screen_size: ?renderer.ScreenSize,
+
 /// Explicit padding.
 padding: renderer.Options.Padding,
 
@@ -242,6 +246,7 @@ pub fn init(alloc: Allocator, options: renderer.Options) !Metal {
         .alloc = alloc,
         .surface_mailbox = options.surface_mailbox,
         .cell_size = .{ .width = metrics.cell_width, .height = metrics.cell_height },
+        .screen_size = null,
         .padding = options.padding,
         .focused = true,
         .cursor_visible = true,
@@ -382,7 +387,8 @@ pub fn threadExit(self: *const Metal) void {
 
 /// Returns the grid size for a given screen size. This is safe to call
 /// on any thread.
-fn gridSize(self: *Metal, screen_size: renderer.ScreenSize) renderer.GridSize {
+fn gridSize(self: *Metal) ?renderer.GridSize {
+    const screen_size = self.screen_size orelse return null;
     return renderer.GridSize.init(
         screen_size.subPadding(self.padding.explicit),
         self.cell_size,
@@ -433,6 +439,14 @@ pub fn setFontSize(self: *Metal, size: font.face.DesiredSize) !void {
     if (std.meta.eql(self.cell_size, new_cell_size)) return;
     self.cell_size = new_cell_size;
 
+    // Resize our font shaping buffer to fit the new width.
+    if (self.gridSize()) |grid_size| {
+        var shape_buf = try self.alloc.alloc(font.shape.Cell, grid_size.columns * 2);
+        errdefer self.alloc.free(shape_buf);
+        self.alloc.free(self.font_shaper.cell_buf);
+        self.font_shaper.cell_buf = shape_buf;
+    }
+
     // Set the sprite font up
     self.font_group.group.sprite = font.sprite.Face{
         .width = @floatToInt(u32, self.cell_size.width),
@@ -696,8 +710,12 @@ fn drawCells(
 
 /// Resize the screen.
 pub fn setScreenSize(self: *Metal, dim: renderer.ScreenSize) !void {
-    // Recalculate the rows/columns.
-    const grid_size = self.gridSize(dim);
+    // Store our screen size
+    self.screen_size = dim;
+
+    // Recalculate the rows/columns. This can't fail since we just set
+    // the screen size above.
+    const grid_size = self.gridSize().?;
 
     // Determine if we need to pad the window. For "auto" padding, we take
     // the leftover amounts on the right/bottom that don't fit a full grid cell
diff --git a/src/renderer/OpenGL.zig b/src/renderer/OpenGL.zig
index 8f8005b00..1cf860d88 100644
--- a/src/renderer/OpenGL.zig
+++ b/src/renderer/OpenGL.zig
@@ -46,6 +46,10 @@ alloc: std.mem.Allocator,
 /// Current cell dimensions for this grid.
 cell_size: renderer.CellSize,
 
+/// Current screen size dimensions for this grid. This is set on the first
+/// resize event, and is not immediately available.
+screen_size: ?renderer.ScreenSize,
+
 /// The current set of cells to render. Each set of cells goes into
 /// a separate shader call.
 cells_bg: std.ArrayListUnmanaged(GPUCell),
@@ -365,6 +369,7 @@ pub fn init(alloc: Allocator, options: renderer.Options) !OpenGL {
         .cells = .{},
         .cells_lru = CellsLRU.init(0),
         .cell_size = .{ .width = metrics.cell_width, .height = metrics.cell_height },
+        .screen_size = null,
         .program = program,
         .vao = vao,
         .ebo = ebo,
@@ -606,6 +611,15 @@ pub fn setFontSize(self: *OpenGL, size: font.face.DesiredSize) !void {
     if (std.meta.eql(self.cell_size, new_cell_size)) return;
     self.cell_size = new_cell_size;
 
+    // Resize our font shaping buffer to fit the new width.
+    if (self.screen_size) |dim| {
+        const grid_size = self.gridSize(dim);
+        var shape_buf = try self.alloc.alloc(font.shape.Cell, grid_size.columns * 2);
+        errdefer self.alloc.free(shape_buf);
+        self.alloc.free(self.font_shaper.cell_buf);
+        self.font_shaper.cell_buf = shape_buf;
+    }
+
     // Notify the window that the cell size changed.
     _ = self.surface_mailbox.push(.{
         .cell_size = new_cell_size,
@@ -1185,6 +1199,9 @@ pub fn setScreenSize(self: *OpenGL, dim: renderer.ScreenSize) !void {
     if (single_threaded_draw) self.draw_mutex.lock();
     defer if (single_threaded_draw) self.draw_mutex.unlock();
 
+    // Store our screen size
+    self.screen_size = dim;
+
     // Recalculate the rows/columns.
     const grid_size = self.gridSize(dim);