diff --git a/internal/tui/components/dialogs/models/models.go b/internal/tui/components/dialogs/models/models.go
index 6d5fa155b2371865771b55c16f8fdbf65d3df952..730cc5d5693dd06821c1ff30cb26398b14325c62 100644
--- a/internal/tui/components/dialogs/models/models.go
+++ b/internal/tui/components/dialogs/models/models.go
@@ -97,13 +97,13 @@ func (m *modelDialogCmp) Init() tea.Cmd {
 		}
 		modelItems = append(modelItems, commands.NewItemSection(name))
 		for _, model := range provider.Models {
-			if model.ID == agentModel.ID && provider.ID == agentProvider.ID {
-				selectIndex = len(modelItems) // Set the selected index to the current model
-			}
 			modelItems = append(modelItems, completions.NewCompletionItem(model.Name, ModelOption{
 				Provider: provider,
 				Model:    model,
 			}))
+			if model.ID == agentModel.ID && provider.ID == agentProvider.ID {
+				selectIndex = len(modelItems) - 1 // Set the selected index to the current model
+			}
 		}
 	}