diff --git a/src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html b/src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html
index 3b47d158d05..1b1a5ca7d43 100644
--- a/src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html
+++ b/src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html
@@ -48,6 +48,15 @@
   [componentContent]="componentContent"
   (promptChangedEvent)="promptChanged($event)"
 />
+<mat-form-field>
+  <mat-label i18n>Model</mat-label>
+  <mat-select [(ngModel)]="componentContent.model" (ngModelChange)="this.componentChanged()">
+    @for (model of models; track model) {
+      <mat-option [value]="model">{{ model }}</mat-option>
+    }
+  </mat-select>
+</mat-form-field>
+<br />
 <mat-checkbox
   color="primary"
   class="enable-computer-avatar-checkbox"
diff --git a/src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.ts b/src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.ts
index 9bb45890b67..3e665fe70f0 100644
--- a/src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.ts
+++ b/src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.ts
@@ -1,32 +1,36 @@
+import { AbstractComponentAuthoring } from '../../../authoringTool/components/AbstractComponentAuthoring';
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
 import { Component } from '@angular/core';
+import { EditComponentPrompt } from '../../../../../app/authoring-tool/edit-component-prompt/edit-component-prompt.component';
+import { EditDialogGuidanceComputerAvatarComponent } from '../../dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component';
 import { FormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCheckbox } from '@angular/material/checkbox';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIcon } from '@angular/material/icon';
 import { MatInput } from '@angular/material/input';
+import { MatOption, MatSelect } from '@angular/material/select';
 import { MatTooltip } from '@angular/material/tooltip';
-import { EditComponentPrompt } from '../../../../../app/authoring-tool/edit-component-prompt/edit-component-prompt.component';
-import { AbstractComponentAuthoring } from '../../../authoringTool/components/AbstractComponentAuthoring';
-import { EditDialogGuidanceComputerAvatarComponent } from '../../dialogGuidance/edit-dialog-guidance-computer-avatar/edit-dialog-guidance-computer-avatar.component';
 
 @Component({
   templateUrl: './ai-chat-authoring.component.html',
   styleUrl: './ai-chat-authoring.component.scss',
   imports: [
-    MatButtonModule,
-    MatTooltip,
-    MatIcon,
-    MatFormFieldModule,
-    MatInput,
     CdkTextareaAutosize,
-    FormsModule,
     EditComponentPrompt,
+    EditDialogGuidanceComputerAvatarComponent,
+    FormsModule,
+    MatButtonModule,
     MatCheckbox,
-    EditDialogGuidanceComputerAvatarComponent
+    MatFormFieldModule,
+    MatIcon,
+    MatInput,
+    MatOption,
+    MatSelect,
+    MatTooltip
   ]
 })
 export class AiChatAuthoringComponent extends AbstractComponentAuthoring {
+  protected models: string[] = ['gpt-4o', 'gpt-4o-mini', 'gpt-5.4', 'gpt-5.4-mini', 'gpt-5.4-nano'];
   protected showSystemPromptHelp = false;
 }
diff --git a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
index af402027901..4fd8fe2a56c 100644
--- a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
+++ b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html
@@ -3,15 +3,6 @@
     <ng-template mat-tab-label>
       <mat-icon>settings</mat-icon>&nbsp;<span i18n>General</span>
     </ng-template>
-    <mat-form-field>
-      <mat-label i18n>Model</mat-label>
-      <mat-select [(ngModel)]="componentContent.model" (ngModelChange)="this.componentChanged()">
-        @for (model of models; track model) {
-          <mat-option [value]="model">{{ model }}</mat-option>
-        }
-      </mat-select>
-    </mat-form-field>
-    <br />
     <edit-component-width [componentContent]="component.content" />
   </mat-tab>
   <mat-tab>
diff --git a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.ts b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.ts
index edde60a0e2f..094a814de96 100644
--- a/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.ts
+++ b/src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.ts
@@ -12,5 +12,4 @@ import { EditComponentAdvancedSharedModule } from '../../../../../app/authoring-
 export class EditAiChatAdvancedComponent extends EditAdvancedComponentComponent {
   protected allowedConnectedComponentTypes = ['OpenResponse'];
   componentContent: AiChatContent;
-  protected models: string[] = ['gpt-4o', 'gpt-4o-mini', 'gpt-5.4', 'gpt-5.4-mini', 'gpt-5.4-nano'];
 }
diff --git a/src/messages.xlf b/src/messages.xlf
index 84a11c314db..c55672fbc8c 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -962,7 +962,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">46,47</context>
+          <context context-type="linenumber">37,38</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
@@ -10684,7 +10684,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">38,41</context>
+          <context context-type="linenumber">29,32</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
@@ -10798,7 +10798,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">50,52</context>
+          <context context-type="linenumber">41,43</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
@@ -13754,7 +13754,7 @@ The branches will be removed but the steps will remain in the unit.</source>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">4,7</context>
+          <context context-type="linenumber">4,6</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
@@ -16690,11 +16690,18 @@ Are you sure you want to proceed?</source>
           <context context-type="linenumber">46,49</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="1141886420788473147" datatype="html">
+        <source>Model</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html</context>
+          <context context-type="linenumber">52,53</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="487123292048554984" datatype="html">
         <source>Enable Computer Avatar</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/aiChat/ai-chat-authoring/ai-chat-authoring.component.html</context>
-          <context context-type="linenumber">57,60</context>
+          <context context-type="linenumber">66,69</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html</context>
@@ -16734,18 +16741,11 @@ Are you sure you want to proceed?</source>
           <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1141886420788473147" datatype="html">
-        <source>Model</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">7,8</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="8271357500216966879" datatype="html">
         <source>Visibility</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">19,21</context>
+          <context context-type="linenumber">10,12</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>
@@ -16828,7 +16828,7 @@ Are you sure you want to proceed?</source>
         <source>Connections</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/aiChat/edit-ai-chat-advanced/edit-ai-chat-advanced.component.html</context>
-          <context context-type="linenumber">25,28</context>
+          <context context-type="linenumber">16,19</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/animation/edit-animation-advanced/edit-animation-advanced.component.html</context>