diff --git a/gfx/context/bbqnx_ctx.c b/gfx/context/bbqnx_ctx.c
index fd60a8eda4..f8a07df390 100644
--- a/gfx/context/bbqnx_ctx.c
+++ b/gfx/context/bbqnx_ctx.c
@@ -323,7 +323,11 @@ static void gfx_ctx_set_resize(unsigned width, unsigned height)
 static void gfx_ctx_update_window_title(void)
 {
    char buf[128], buf_fps[128];
-   gfx_get_fps(buf, sizeof(buf), buf_fps, sizeof(buf_fps));
+   bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW);
+   gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps));
+
+   if (fps_draw)
+      msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
 }
 
 static bool gfx_ctx_set_video_mode(