diff --git a/v2/internal/appng/app_production.go b/v2/internal/appng/app_production.go
index c4a67e99..4161d240 100644
--- a/v2/internal/appng/app_production.go
+++ b/v2/internal/appng/app_production.go
@@ -78,12 +78,14 @@ func CreateApp(appoptions *options.App) (*App, error) {
 	ctx = context.WithValue(ctx, "events", eventHandler)
 	messageDispatcher := dispatcher.NewDispatcher(myLogger, appBindings, eventHandler)
 
-	appFrontend := desktop.NewFrontend(ctx, appoptions, myLogger, appBindings, messageDispatcher)
-	eventHandler.AddFrontend(appFrontend)
-
+	debug := IsDebug()
+	ctx = context.WithValue(ctx, "debug", debug)
 	// Attach logger to context
 	ctx = context.WithValue(ctx, "logger", myLogger)
 
+	appFrontend := desktop.NewFrontend(ctx, appoptions, myLogger, appBindings, messageDispatcher)
+	eventHandler.AddFrontend(appFrontend)
+
 	result := &App{
 		ctx:              ctx,
 		frontend:         appFrontend,
@@ -91,13 +93,10 @@ func CreateApp(appoptions *options.App) (*App, error) {
 		menuManager:      menuManager,
 		startupCallback:  appoptions.OnStartup,
 		shutdownCallback: appoptions.OnShutdown,
-		debug:            IsDebug(),
+		debug:            debug,
+		options:          appoptions,
 	}
 
-	result.options = appoptions
-
-	result.ctx = context.WithValue(result.ctx, "debug", result.debug)
-
 	return result, nil
 
 }