diff --git a/include/dusk/gx_helper.h b/include/dusk/gx_helper.h
index adb547ac29..bf81424c99 100644
--- a/include/dusk/gx_helper.h
+++ b/include/dusk/gx_helper.h
@@ -42,4 +42,13 @@ typedef GXTexObjRAII TGXTexObj;
 typedef GXTexObj TGXTexObj;
 #endif
 
+struct GXScopedDebugGroup {
+    explicit GXScopedDebugGroup(const char* text) {
+        GXPushDebugGroup(text);
+    }
+    ~GXScopedDebugGroup() {
+        GXPopDebugGroup();
+    }
+};
+
 #endif  // DUSK_GX_HELPER_H
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 8b34e99c2d..e6e8f54f37 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -1865,6 +1865,12 @@ int dDlst_list_c::set(dDlst_base_c**& p_start, dDlst_base_c**& p_end, dDlst_base
 void dDlst_list_c::draw(dDlst_base_c** p_start, dDlst_base_c** p_end) {
     for (; p_start < p_end; p_start++) {
         dDlst_base_c* dlst = *p_start;
+
+#if DEBUG && TARGET_PC
+        char buf[64];
+        snprintf(buf, sizeof(buf), "%s::draw()", typeid(dlst).name());
+        GXScopedDebugGroup scope(buf);
+#endif
         dlst->draw();
     }
 }
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index 94ba2fe6ce..c2d6dcc23c 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -1653,7 +1653,7 @@ int mDoGph_Painter() {
     #endif
 
     dComIfGp_setCurrentGrafPort(&ortho);
-    dComIfGd_drawCopy2D();
+    GX_DEBUG_GROUP(dComIfGd_drawCopy2D);
 
     #if DEBUG
     // "↓↓↓↓↓↓↓↓↓↓ CPU time measuring start ↓↓↓↓↓↓↓↓↓↓"
@@ -2166,25 +2166,25 @@ int mDoGph_Painter() {
         JPADrawInfo draw_info3(m5, 0.0f, FB_HEIGHT, 0.0f, FB_WIDTH);
 
         if (!dComIfGp_isPauseFlag()) {
-            dComIfGp_particle_draw2Dback(&draw_info3);
+            GX_DEBUG_GROUP(dComIfGp_particle_draw2Dback, &draw_info3);
         }
 
-        dComIfGp_particle_draw2DmenuBack(&draw_info3);
+        GX_DEBUG_GROUP(dComIfGp_particle_draw2DmenuBack, &draw_info3);
         ortho.setPort();
 
-        dComIfGd_draw2DOpa();
-        drawItem3D();
+        GX_DEBUG_GROUP(dComIfGd_draw2DOpa);
+        GX_DEBUG_GROUP(drawItem3D);
         ortho.setPort();
 
         #if DEBUG
         captureScreenSetPort();
         #endif
 
-        dComIfGd_draw2DOpaTop();
-        dComIfGd_draw2DXlu();
+        GX_DEBUG_GROUP(dComIfGd_draw2DOpaTop);
+        GX_DEBUG_GROUP(dComIfGd_draw2DXlu);
 
-        if (!dComIfGp_isPauseFlag()) {
-            dComIfGp_particle_draw2Dfore(&draw_info3);
+        if (dComIfGp_isPauseFlag()) {
+            GX_DEBUG_GROUP(dComIfGp_particle_draw2Dfore, &draw_info3);
         }
 
 #if DEBUG
@@ -2197,7 +2197,7 @@ int mDoGph_Painter() {
             mDoGph_gInf_c::calcFade();
         }
 
-        dComIfGp_particle_draw2DmenuFore(&draw_info3);
+        GX_DEBUG_GROUP(dComIfGp_particle_draw2DmenuFore, &draw_info3);
         j3dSys.setViewMtx(m4);
     } else {
         // No camera window active — still draw 2D display lists