diff --git a/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-new.js b/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-new.js
index 1e645097..463ae21a 100644
--- a/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-new.js
+++ b/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-new.js
@@ -1,6 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default class DiscourseAiToolsNewRoute extends DiscourseRoute {
+  beforeModel(transition) {
+    this.preset = transition.to.queryParams.presetId || "empty_tool";
+  }
+
   async model() {
     return this.store.createRecord("ai-tool");
   }
@@ -8,10 +12,10 @@ export default class DiscourseAiToolsNewRoute extends DiscourseRoute {
   setupController(controller) {
     super.setupController(...arguments);
     const toolsModel = this.modelFor("adminPlugins.show.discourse-ai-tools");
-
     controller.set("allTools", toolsModel);
     controller.set("presets", toolsModel.resultSetMeta.presets);
     controller.set("llms", toolsModel.resultSetMeta.llms);
     controller.set("settings", toolsModel.resultSetMeta.settings);
+    controller.set("selectedPreset", this.preset);
   }
 }
diff --git a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.hbs b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.hbs
index 444f6966..cc036e76 100644
--- a/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.hbs
+++ b/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.hbs
@@ -5,5 +5,6 @@
     @presets={{this.presets}}
     @llms={{this.llms}}
     @settings={{this.settings}}
+    @selectedPreset={{this.selectedPreset}}
   />
 </section>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/ai-tool-editor.gjs b/assets/javascripts/discourse/components/ai-tool-editor.gjs
index 0a3b4922..b5b0fa6b 100644
--- a/assets/javascripts/discourse/components/ai-tool-editor.gjs
+++ b/assets/javascripts/discourse/components/ai-tool-editor.gjs
@@ -13,7 +13,6 @@ import DTooltip from "discourse/components/d-tooltip";
 import withEventValue from "discourse/helpers/with-event-value";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { i18n } from "discourse-i18n";
-import ComboBox from "select-kit/components/combo-box";
 import AiToolParameterEditor from "./ai-tool-parameter-editor";
 import AiToolTestModal from "./modal/ai-tool-test-modal";
 import RagOptions from "./rag-options";
@@ -33,34 +32,26 @@ export default class AiToolEditor extends Component {
   @tracked isSaving = false;
   @tracked editingModel = null;
   @tracked showDelete = false;
-  @tracked selectedPreset = null;
 
-  get presets() {
-    return this.args.presets.map((preset) => {
-      return {
-        name: preset.preset_name,
-        id: preset.preset_id,
-      };
-    });
-  }
+  get selectedPreset() {
+    if (!this.args.selectedPreset) {
+      return null;
+    }
 
-  get showPresets() {
-    return !this.selectedPreset && this.args.model.isNew;
+    return this.args.presets.findBy("preset_id", this.args.selectedPreset);
   }
 
   @action
   updateModel() {
-    this.editingModel = this.args.model.workingCopy();
-    this.showDelete = !this.args.model.isNew;
-  }
-
-  @action
-  configurePreset() {
-    this.selectedPreset = this.args.presets.findBy("preset_id", this.presetId);
-    this.editingModel = this.store
-      .createRecord("ai-tool", this.selectedPreset)
-      .workingCopy();
-    this.showDelete = false;
+    if (this.args.model.isNew) {
+      this.editingModel = this.store
+        .createRecord("ai-tool", this.selectedPreset)
+        .workingCopy();
+      this.showDelete = false;
+    } else {
+      this.editingModel = this.args.model.workingCopy();
+      this.showDelete = !this.args.model.isNew;
+    }
   }
 
   @action
@@ -148,138 +139,116 @@ export default class AiToolEditor extends Component {
       {{didUpdate this.updateModel @model.id}}
       class="form-horizontal ai-tool-editor"
     >
-      {{#if this.showPresets}}
-        <div class="control-group">
-          <label>{{i18n "discourse_ai.tools.presets"}}</label>
-          <ComboBox
-            @value={{this.presetId}}
-            @content={{this.presets}}
-            class="ai-tool-editor__presets"
-          />
-        </div>
+      <div class="control-group">
+        <label>{{i18n "discourse_ai.tools.name"}}</label>
+        <input
+          {{on "input" (withEventValue (fn (mut this.editingModel.name)))}}
+          value={{this.editingModel.name}}
+          type="text"
+          class="ai-tool-editor__name"
+        />
+        <DTooltip
+          @icon="circle-question"
+          @content={{i18n "discourse_ai.tools.name_help"}}
+        />
+      </div>
 
-        <div class="control-group ai-llm-editor__action_panel">
-          <DButton
-            @action={{this.configurePreset}}
-            @label="discourse_ai.tools.next.title"
-            class="ai-tool-editor__next"
-          />
-        </div>
-      {{else}}
-        <div class="control-group">
-          <label>{{i18n "discourse_ai.tools.name"}}</label>
-          <input
-            {{on "input" (withEventValue (fn (mut this.editingModel.name)))}}
-            value={{this.editingModel.name}}
-            type="text"
-            class="ai-tool-editor__name"
-          />
-          <DTooltip
-            @icon="circle-question"
-            @content={{i18n "discourse_ai.tools.name_help"}}
-          />
-        </div>
+      <div class="control-group">
+        <label>{{i18n "discourse_ai.tools.tool_name"}}</label>
+        <input
+          {{on "input" (withEventValue (fn (mut this.editingModel.tool_name)))}}
+          value={{this.editingModel.tool_name}}
+          type="text"
+          class="ai-tool-editor__tool_name"
+        />
+        <DTooltip
+          @icon="circle-question"
+          @content={{i18n "discourse_ai.tools.tool_name_help"}}
+        />
+      </div>
 
-        <div class="control-group">
-          <label>{{i18n "discourse_ai.tools.tool_name"}}</label>
-          <input
-            {{on
-              "input"
-              (withEventValue (fn (mut this.editingModel.tool_name)))
-            }}
-            value={{this.editingModel.tool_name}}
-            type="text"
-            class="ai-tool-editor__tool_name"
-          />
-          <DTooltip
-            @icon="circle-question"
-            @content={{i18n "discourse_ai.tools.tool_name_help"}}
-          />
-        </div>
+      <div class="control-group">
+        <label>{{i18n "discourse_ai.tools.description"}}</label>
+        <textarea
+          {{on
+            "input"
+            (withEventValue (fn (mut this.editingModel.description)))
+          }}
+          placeholder={{i18n "discourse_ai.tools.description_help"}}
+          class="ai-tool-editor__description input-xxlarge"
+        >{{this.editingModel.description}}</textarea>
+      </div>
 
-        <div class="control-group">
-          <label>{{i18n "discourse_ai.tools.description"}}</label>
-          <textarea
-            {{on
-              "input"
-              (withEventValue (fn (mut this.editingModel.description)))
-            }}
-            placeholder={{i18n "discourse_ai.tools.description_help"}}
-            class="ai-tool-editor__description input-xxlarge"
-          >{{this.editingModel.description}}</textarea>
-        </div>
+      <div class="control-group">
+        <label>{{i18n "discourse_ai.tools.summary"}}</label>
+        <input
+          {{on "input" (withEventValue (fn (mut this.editingModel.summary)))}}
+          value={{this.editingModel.summary}}
+          type="text"
+          class="ai-tool-editor__summary input-xxlarge"
+        />
+        <DTooltip
+          @icon="circle-question"
+          @content={{i18n "discourse_ai.tools.summary_help"}}
+        />
+      </div>
 
-        <div class="control-group">
-          <label>{{i18n "discourse_ai.tools.summary"}}</label>
-          <input
-            {{on "input" (withEventValue (fn (mut this.editingModel.summary)))}}
-            value={{this.editingModel.summary}}
-            type="text"
-            class="ai-tool-editor__summary input-xxlarge"
-          />
-          <DTooltip
-            @icon="circle-question"
-            @content={{i18n "discourse_ai.tools.summary_help"}}
-          />
-        </div>
+      <div class="control-group">
+        <label>{{i18n "discourse_ai.tools.parameters"}}</label>
+        <AiToolParameterEditor @parameters={{this.editingModel.parameters}} />
+      </div>
 
-        <div class="control-group">
-          <label>{{i18n "discourse_ai.tools.parameters"}}</label>
-          <AiToolParameterEditor @parameters={{this.editingModel.parameters}} />
-        </div>
+      <div class="control-group">
+        <label>{{i18n "discourse_ai.tools.script"}}</label>
+        <AceEditor
+          @content={{this.editingModel.script}}
+          @onChange={{fn (mut this.editingModel.script)}}
+          @mode={{ACE_EDITOR_MODE}}
+          @theme={{ACE_EDITOR_THEME}}
+          @editorId="ai-tool-script-editor"
+        />
+      </div>
 
+      {{#if this.siteSettings.ai_embeddings_enabled}}
         <div class="control-group">
-          <label>{{i18n "discourse_ai.tools.script"}}</label>
-          <AceEditor
-            @content={{this.editingModel.script}}
-            @onChange={{fn (mut this.editingModel.script)}}
-            @mode={{ACE_EDITOR_MODE}}
-            @theme={{ACE_EDITOR_THEME}}
-            @editorId="ai-tool-script-editor"
-          />
-        </div>
-
-        {{#if this.siteSettings.ai_embeddings_enabled}}
-          <div class="control-group">
-            <RagUploader
-              @target={{this.editingModel}}
-              @updateUploads={{this.updateUploads}}
-              @onRemove={{this.removeUpload}}
-              @allowImages={{@settings.rag_images_enabled}}
-            />
-          </div>
-          <RagOptions
-            @model={{this.editingModel}}
-            @llms={{@llms}}
+          <RagUploader
+            @target={{this.editingModel}}
+            @updateUploads={{this.updateUploads}}
+            @onRemove={{this.removeUpload}}
             @allowImages={{@settings.rag_images_enabled}}
           />
-        {{/if}}
-
-        <div class="control-group ai-tool-editor__action_panel">
-          {{#unless @model.isNew}}
-            <DButton
-              @action={{this.openTestModal}}
-              @label="discourse_ai.tools.test"
-              class="ai-tool-editor__test-button"
-            />
-          {{/unless}}
-
-          <DButton
-            @action={{this.save}}
-            @label="discourse_ai.tools.save"
-            @disabled={{this.isSaving}}
-            class="btn-primary ai-tool-editor__save"
-          />
-
-          {{#if this.showDelete}}
-            <DButton
-              @action={{this.delete}}
-              @label="discourse_ai.tools.delete"
-              class="btn-danger ai-tool-editor__delete"
-            />
-          {{/if}}
         </div>
+        <RagOptions
+          @model={{this.editingModel}}
+          @llms={{@llms}}
+          @allowImages={{@settings.rag_images_enabled}}
+        />
       {{/if}}
+
+      <div class="control-group ai-tool-editor__action_panel">
+        {{#unless @model.isNew}}
+          <DButton
+            @action={{this.openTestModal}}
+            @label="discourse_ai.tools.test"
+            class="ai-tool-editor__test-button"
+          />
+        {{/unless}}
+
+        <DButton
+          @action={{this.save}}
+          @label="discourse_ai.tools.save"
+          @disabled={{this.isSaving}}
+          class="btn-primary ai-tool-editor__save"
+        />
+
+        {{#if this.showDelete}}
+          <DButton
+            @action={{this.delete}}
+            @label="discourse_ai.tools.delete"
+            class="btn-danger ai-tool-editor__delete"
+          />
+        {{/if}}
+      </div>
     </form>
   </template>
 }
diff --git a/assets/javascripts/discourse/components/ai-tool-list-editor.gjs b/assets/javascripts/discourse/components/ai-tool-list-editor.gjs
index 3be0173a..7bd7ed21 100644
--- a/assets/javascripts/discourse/components/ai-tool-list-editor.gjs
+++ b/assets/javascripts/discourse/components/ai-tool-list-editor.gjs
@@ -1,6 +1,9 @@
 import Component from "@glimmer/component";
+import { array, fn } from "@ember/helper";
+import { action } from "@ember/object";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
+import { eq } from "truth-helpers";
 import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
 import DButton from "discourse/components/d-button";
 import DPageSubheader from "discourse/components/d-page-subheader";
@@ -11,6 +14,23 @@ import DMenu from "float-kit/components/d-menu";
 
 export default class AiToolListEditor extends Component {
   @service adminPluginNavManager;
+  @service router;
+
+  get lastIndexOfPresets() {
+    return this.args.tools.resultSetMeta.presets.length - 1;
+  }
+
+  @action
+  routeToNewTool(preset) {
+    return this.router.transitionTo(
+      "adminPlugins.show.discourse-ai-tools.new",
+      {
+        queryParams: {
+          presetId: preset.preset_id,
+        },
+      }
+    );
+  }
 
   <template>
     <DBreadcrumbsItem
@@ -28,19 +48,25 @@ export default class AiToolListEditor extends Component {
             @triggerClass="btn-primary btn-small"
             @label={{i18n "discourse_ai.tools.new"}}
             @icon="plus"
+            @placement="bottom-end"
           >
             <:content>
-              {{! TODO add action to dropdown button that prefills editor }}
               <DropdownMenu as |dropdown|>
-                {{#each @tools.resultSetMeta.presets as |preset|}}
+                {{#each @tools.resultSetMeta.presets as |preset index|}}
+                  {{#if (eq index this.lastIndexOfPresets)}}
+                    <dropdown.divider />
+                  {{/if}}
+
                   <dropdown.item>
                     <DButton
                       @translatedLabel={{preset.preset_name}}
+                      @action={{fn this.routeToNewTool preset}}
                       class="btn-transparent"
                     />
                   </dropdown.item>
                 {{/each}}
               </DropdownMenu>
+
             </:content>
           </DMenu>
         </:actions>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b4a2c00d..061b2e5b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -327,10 +327,7 @@ en:
         test: "Run test"
         delete: "Delete"
         saved: "Tool saved"
-        presets: "Select a preset..."
         confirm_delete: "Are you sure you want to delete this tool?"
-        next:
-          title: "Next"
         test_modal:
           title: "Test AI tool"
           run: "Run test"