diff --git a/go.mod b/go.mod
index 8f17117..1429336 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/charmbracelet/bubbles v0.17.1
 	github.com/charmbracelet/bubbletea v0.25.0
 	github.com/charmbracelet/glamour v0.6.0
-	github.com/charmbracelet/huh v0.2.3
+	github.com/charmbracelet/huh v0.2.4-0.20240117190532-a5a6807deb14
 	github.com/charmbracelet/lipgloss v0.9.1
 	github.com/charmbracelet/x/editor v0.0.0-20231116172829-450eedbca1ab
 	github.com/charmbracelet/x/exp/ordered v0.0.0-20231010190216-1cb11efc897d
diff --git a/go.sum b/go.sum
index ab461e4..58e5a08 100644
--- a/go.sum
+++ b/go.sum
@@ -23,8 +23,8 @@ github.com/charmbracelet/bubbletea v0.25.0 h1:bAfwk7jRz7FKFl9RzlIULPkStffg5k6pNt
 github.com/charmbracelet/bubbletea v0.25.0/go.mod h1:EN3QDR1T5ZdWmdfDzYcqOCAps45+QIJbLOBxmVNWNNg=
 github.com/charmbracelet/glamour v0.6.0 h1:wi8fse3Y7nfcabbbDuwolqTqMQPMnVPeZhDM273bISc=
 github.com/charmbracelet/glamour v0.6.0/go.mod h1:taqWV4swIMMbWALc0m7AfE9JkPSU8om2538k9ITBxOc=
-github.com/charmbracelet/huh v0.2.3 h1:fZaqnd/fiO7jlfcLqhP2iwpLt670IaHQfL/7Qu+fBm0=
-github.com/charmbracelet/huh v0.2.3/go.mod h1:XmADLRnJs/Jqw7zIbi9BTss5gXbOkR6feyVoNAp19rA=
+github.com/charmbracelet/huh v0.2.4-0.20240117190532-a5a6807deb14 h1:p8EkQ0TGf5lt+EcPlfIjt0BPTIM2sdSIYt1DVqlH474=
+github.com/charmbracelet/huh v0.2.4-0.20240117190532-a5a6807deb14/go.mod h1:NlYSEnyQxG6pAy5MfrUXJdJOYQv691EwTLbjo8Nw3us=
 github.com/charmbracelet/lipgloss v0.9.1 h1:PNyd3jvaJbg4jRHKWXnCj1akQm4rh8dbEzN1p/u1KWg=
 github.com/charmbracelet/lipgloss v0.9.1/go.mod h1:1mPmG4cxScwUQALAAnacHaigiiHB9Pmr+v1VEawJl6I=
 github.com/charmbracelet/x/editor v0.0.0-20231116172829-450eedbca1ab h1:95WbogoQheYFuAUy1olU8OgxrHk2K86zA7mSNELiMfU=
diff --git a/main.go b/main.go
index 44271ae..5ba9410 100644
--- a/main.go
+++ b/main.go
@@ -84,12 +84,11 @@ var (
 			}
 
 			if isNoArgs() && isInputTTY() {
-				var groups []*huh.Group
-				if config.AskModel {
-					groups = append(groups, huh.NewGroup(newModelSelect()))
-				}
-				groups = append(groups, huh.NewGroup(newPromptInput()))
-				if err := huh.NewForm(groups...).Run(); err != nil {
+				if err := huh.NewForm(
+					huh.NewGroup(newModelSelect()).
+						WithHideFunc(func() bool { return !config.AskModel }),
+					huh.NewGroup(newPromptInput()),
+				).Run(); err != nil {
 					return modsError{
 						err:    err,
 						reason: "Prompt failed",