diff --git a/pkg/cli/gptscript.go b/pkg/cli/gptscript.go
index 5a44c5fb..fab9b2a2 100644
--- a/pkg/cli/gptscript.go
+++ b/pkg/cli/gptscript.go
@@ -330,7 +330,7 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
 
 	// If the user is trying to launch the chat-builder UI, then set up the tool and options here.
 	if r.UI {
-		args = append([]string{env.VarOrDefault("GPTSCRIPT_CHAT_UI_TOOL", "github.com/gptscript-ai/ui")}, args...)
+		args = append([]string{uiTool()}, args...)
 
 		// If args has more than one element, then the user has provided a file.
 		if len(args) > 1 {
@@ -493,3 +493,15 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
 
 	return r.PrintOutput(toolInput, s)
 }
+
+// uiTool returns the versioned UI tool reference for the current GPTScript version.
+// For release versions, a reference with a matching release tag is returned.
+// For all other versions, a reference to main is returned.
+func uiTool() string {
+	ref := "github.com/gptscript-ai/ui"
+	if tag := version.Tag; !strings.Contains(tag, "v0.0.0-dev") {
+		ref = fmt.Sprintf("%s@%s", ref, tag)
+	}
+
+	return env.VarOrDefault("GPTSCRIPT_CHAT_UI_TOOL", ref)
+}