diff --git a/src/Surface.zig b/src/Surface.zig
index 60f29ccc6..5396c2068 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -155,7 +155,6 @@ const DerivedConfig = struct {
     window_padding_y: u32,
     window_padding_balance: bool,
     title: ?[:0]const u8,
-    fullscreen: bool,
 
     pub fn init(alloc_gpa: Allocator, config: *const configpkg.Config) !DerivedConfig {
         var arena = ArenaAllocator.init(alloc_gpa);
@@ -181,7 +180,6 @@ const DerivedConfig = struct {
             .window_padding_y = config.@"window-padding-y",
             .window_padding_balance = config.@"window-padding-balance",
             .title = config.title,
-            .fullscreen = config.fullscreen,
 
             // Assignments happen sequentially so we have to do this last
             // so that the memory is captured from allocs above.
diff --git a/src/apprt/embedded.zig b/src/apprt/embedded.zig
index b7ae1c6ee..a38defa34 100644
--- a/src/apprt/embedded.zig
+++ b/src/apprt/embedded.zig
@@ -101,6 +101,8 @@ pub const App = struct {
 
         /// Called when the cell size changes.
         set_cell_size: ?*const fn (SurfaceUD, u32, u32) callconv(.C) void = null,
+
+        fullscreen: ?*const fn (SurfaceUD, configpkg.NonNativeFullscreen) callconv(.C) void = null,
     };
 
     /// Special values for the goto_tab callback.
diff --git a/src/config/Config.zig b/src/config/Config.zig
index 644f665a5..8e9b720fe 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -280,6 +280,7 @@ command: ?[]const u8 = null,
 
 /// The setting to tell Ghostty to start in fullscreen mode.
 /// By default with will start windowed.
+/// New windows created when this is set to true will not start in fullscreen.
 fullscreen: bool = false,
 
 /// The setting that will change the application class value.