diff --git a/src/Window.zig b/src/Window.zig
index 51b69fce3..b0c78d063 100644
--- a/src/Window.zig
+++ b/src/Window.zig
@@ -318,6 +318,17 @@ pub fn create(alloc: Allocator, loop: libuv.Loop, config: *const Config) !*Windo
     window.setCursorPosCallback(cursorPosCallback);
     window.setMouseButtonCallback(mouseButtonCallback);
 
+    // Call our size callback which handles all our retina setup
+    // Note: this shouldn't be necessary and when we clean up the window
+    // init stuff we should get rid of this. But this is required because
+    // sizeCallback does retina-aware stuff we don't do here and don't want
+    // to duplicate.
+    sizeCallback(
+        window,
+        @intCast(i32, window_size.width),
+        @intCast(i32, window_size.height),
+    );
+
     return self;
 }
 
@@ -394,11 +405,23 @@ fn sizeCallback(window: glfw.Window, width: i32, height: i32) void {
     assert(width >= 0);
     assert(height >= 0);
 
+    // Get our framebuffer size since this will give us the size in pixels
+    // whereas width/height in this callback is in screen coordinates. For
+    // Retina displays (or any other displays that have a scale factor),
+    // these will not match.
+    const px_size = window.getFramebufferSize() catch |err| err: {
+        log.err("error querying window size in pixels, will use screen size err={}", .{err});
+        break :err glfw.Window.Size{
+            .width = @intCast(u32, width),
+            .height = @intCast(u32, height),
+        };
+    };
+
     // Update our grid so that the projections on render are correct.
     const win = window.getUserPointer(Window) orelse return;
     win.grid.setScreenSize(.{
-        .width = @intCast(u32, width),
-        .height = @intCast(u32, height),
+        .width = px_size.width,
+        .height = px_size.height,
     }) catch |err| log.err("error updating grid screen size err={}", .{err});
 
     // Update the size of our terminal state
@@ -413,18 +436,6 @@ fn sizeCallback(window: glfw.Window, width: i32, height: i32) void {
         .ws_ypixel = @intCast(u16, height),
     }) catch |err| log.err("error updating pty screen size err={}", .{err});
 
-    // Get our framebuffer size since this will give us the size in pixels
-    // whereas width/height in this callback is in screen coordinates. For
-    // Retina displays (or any other displays that have a scale factor),
-    // these will not match.
-    const px_size = window.getFramebufferSize() catch |err| err: {
-        log.err("error querying window size in pixels, will use screen size err={}", .{err});
-        break :err glfw.Window.Size{
-            .width = @intCast(u32, width),
-            .height = @intCast(u32, height),
-        };
-    };
-
     // Update our viewport for this context to be the entire window.
     // OpenGL works in pixels, so we have to use the pixel size.
     gl.viewport(0, 0, @intCast(i32, px_size.width), @intCast(i32, px_size.height)) catch |err|
diff --git a/src/config.zig b/src/config.zig
index 63043eb4b..0b68542e4 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -6,7 +6,10 @@ const ArenaAllocator = std.heap.ArenaAllocator;
 /// CLI flag names hence we use a lot of `@""` syntax to support hyphens.
 pub const Config = struct {
     /// Font size
-    @"font-size": u8 = 14,
+    /// TODO: this default size is too big, what we need to do is use a reasonable
+    /// size and then mult a high-DPI scaling factor. This is only high because
+    /// all our test machines are high-DPI right now.
+    @"font-size": u8 = 32,
 
     /// Background color for the window.
     background: Color = .{ .r = 0, .g = 0, .b = 0 },