diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go
index e91478541..6a8004095 100644
--- a/v2/internal/frontend/desktop/windows/frontend.go
+++ b/v2/internal/frontend/desktop/windows/frontend.go
@@ -112,13 +112,16 @@ func (f *Frontend) Run(ctx context.Context) error {
 		}
 	})
 
-	// TODO: Move this into a callback from frontend
 	go func() {
 		if f.frontendOptions.OnStartup != nil {
 			f.frontendOptions.OnStartup(f.ctx)
 		}
 	}()
 
+	if f.frontendOptions.Fullscreen {
+		mainWindow.Fullscreen()
+	}
+
 	mainWindow.Run()
 	return nil
 }
diff --git a/v2/internal/frontend/desktop/windows/window.go b/v2/internal/frontend/desktop/windows/window.go
index cd3a5b6b9..5a577ab2e 100644
--- a/v2/internal/frontend/desktop/windows/window.go
+++ b/v2/internal/frontend/desktop/windows/window.go
@@ -75,10 +75,6 @@ func NewWindow(parent winc.Controller, options *options.App) *Window {
 
 	result.SetFont(winc.DefaultFont)
 
-	if options.Fullscreen {
-		result.Fullscreen()
-	}
-
 	if options.Menu != nil {
 		result.SetApplicationMenu(options.Menu)
 	}