diff --git a/newIDE/app/resources/inAppTutorials/flingGame.json b/newIDE/app/resources/inAppTutorials/flingGame.json
index 1e32bda246e2..12cfd6755444 100644
--- a/newIDE/app/resources/inAppTutorials/flingGame.json
+++ b/newIDE/app/resources/inAppTutorials/flingGame.json
@@ -393,7 +393,7 @@
       "elementToHighlightId": "#add-asset-button",
       "isTriggerFlickering": true,
       "nextStepTrigger": {
-        "presenceOfElement": "#object-item-0"
+        "objectAddedInLayout": true
       },
       "tooltip": {
         "description": {
@@ -565,7 +565,7 @@
         {
           "stepId": "CloseAssetStoreForProjectile",
           "trigger": {
-            "presenceOfElement": "#object-item-1"
+            "objectAddedInLayout": true
           }
         }
       ]
@@ -581,7 +581,7 @@
       "elementToHighlightId": "#add-asset-button",
       "isTriggerFlickering": true,
       "nextStepTrigger": {
-        "presenceOfElement": "#object-item-1"
+        "objectAddedInLayout": true
       },
       "mapProjectData": {
         "projectile": "sceneLastObjectName:playScene"
@@ -710,7 +710,7 @@
         {
           "stepId": "CloseAssetStoreForTarget",
           "trigger": {
-            "presenceOfElement": "#object-item-2"
+            "objectAddedInLayout": true
           }
         }
       ]
@@ -726,7 +726,7 @@
       "elementToHighlightId": "#add-asset-button",
       "isTriggerFlickering": true,
       "nextStepTrigger": {
-        "presenceOfElement": "#object-item-2"
+        "objectAddedInLayout": true
       },
       "mapProjectData": {
         "target": "sceneLastObjectName:playScene"
@@ -854,7 +854,7 @@
         {
           "stepId": "CloseAssetStoreForBlock",
           "trigger": {
-            "presenceOfElement": "#object-item-3"
+            "objectAddedInLayout": true
           }
         }
       ]
@@ -870,7 +870,7 @@
       "elementToHighlightId": "#add-asset-button",
       "isTriggerFlickering": true,
       "nextStepTrigger": {
-        "presenceOfElement": "#object-item-3"
+        "objectAddedInLayout": true
       },
       "mapProjectData": {
         "block": "sceneLastObjectName:playScene"
@@ -1746,7 +1746,7 @@
         {
           "stepId": "CloseAssetStoreForBackground",
           "trigger": {
-            "presenceOfElement": "#object-item-4"
+            "objectAddedInLayout": true
           }
         }
       ]
@@ -1762,7 +1762,7 @@
       "elementToHighlightId": "#add-asset-button",
       "isTriggerFlickering": true,
       "nextStepTrigger": {
-        "presenceOfElement": "#object-item-4"
+        "objectAddedInLayout": true
       },
       "mapProjectData": {
         "background": "sceneLastObjectName:playScene"
@@ -2000,7 +2000,7 @@
         {
           "stepId": "CloseAssetStoreForObstacle",
           "trigger": {
-            "presenceOfElement": "#object-item-5"
+            "objectAddedInLayout": true
           }
         }
       ]
@@ -2016,7 +2016,7 @@
       "elementToHighlightId": "#add-asset-button",
       "isTriggerFlickering": true,
       "nextStepTrigger": {
-        "presenceOfElement": "#object-item-5"
+        "objectAddedInLayout": true
       },
       "mapProjectData": {
         "obstacle": "sceneLastObjectName:playScene"
@@ -2874,7 +2874,7 @@
         {
           "stepId": "CloseAssetStoreForGrabArea",
           "trigger": {
-            "presenceOfElement": "#object-item-7"
+            "objectAddedInLayout": true
           }
         }
       ],
@@ -2891,7 +2891,7 @@
       "elementToHighlightId": "#add-asset-button",
       "isTriggerFlickering": true,
       "nextStepTrigger": {
-        "presenceOfElement": "#object-item-7"
+        "objectAddedInLayout": true
       },
       "mapProjectData": {
         "grabArea": "sceneLastObjectName:playScene"
@@ -3560,7 +3560,7 @@
     {
       "elementToHighlightId": "objectInObjectsList:background",
       "nextStepTrigger": {
-        "presenceOfElement": "#objects-list [id^=object-item][data-global=true]"
+        "presenceOfElement": "#objects-list [data-global=true]"
       },
       "tooltip": {
         "description": {
@@ -3872,7 +3872,7 @@
     {
       "elementToHighlightId": "objectInObjectsList:title",
       "nextStepTrigger": {
-        "presenceOfElement": "#scene-editor[data-active=true] #object-item-2"
+        "objectAddedInLayout": true
       },
       "tooltip": {
         "description": {