diff --git a/editor-samples.mceditoraddon b/editor-samples.mceditoraddon
index 428e541..98ed8a0 100644
Binary files a/editor-samples.mceditoraddon and b/editor-samples.mceditoraddon differ
diff --git a/farm-generator/farm-generator.ts b/farm-generator/farm-generator.ts
index 3480850..1a31716 100644
--- a/farm-generator/farm-generator.ts
+++ b/farm-generator/farm-generator.ts
@@ -377,7 +377,7 @@ function addFarmGeneratorTool(uiSession: IPlayerUISession) {
     const toolToggleAction = uiSession.actionManager.createAction({
         actionType: ActionTypes.NoArgsAction,
         onExecute: () => {
-            uiSession.toolRail.setSelectedOptionId(tool.id, true);
+            uiSession.toolRail.setSelectedToolId(tool.id);
         },
     });
 
diff --git a/portal-generator/portal-generator.ts b/portal-generator/portal-generator.ts
index 9a4e157..bd62424 100644
--- a/portal-generator/portal-generator.ts
+++ b/portal-generator/portal-generator.ts
@@ -87,7 +87,7 @@ class PortalGenerator implements IDisposable {
         const toolToggleAction = uiSession.actionManager.createAction({
             actionType: ActionTypes.NoArgsAction,
             onExecute: () => {
-                uiSession.toolRail.setSelectedOptionId(tool.id, true);
+                uiSession.toolRail.setSelectedToolId(tool.id);
             },
         });
 
diff --git a/tree-generator/tree-generator.ts b/tree-generator/tree-generator.ts
index c4a7c6a..bc2d29f 100644
--- a/tree-generator/tree-generator.ts
+++ b/tree-generator/tree-generator.ts
@@ -392,7 +392,7 @@ function addTool(uiSession: IPlayerUISession) {
     const toolToggleAction = uiSession.actionManager.createAction({
         actionType: ActionTypes.NoArgsAction,
         onExecute: () => {
-            uiSession.toolRail.setSelectedOptionId(tool.id, true);
+            uiSession.toolRail.setSelectedToolId(tool.id);
         },
     });