diff --git a/main.go b/main.go
index 7ae268c..4e0848b 100644
--- a/main.go
+++ b/main.go
@@ -212,6 +212,10 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				return m, nil
 			}
 			m.err = nil
+			if len(m.menu) > 0 {
+				m.form = m.buildForm()
+				return m, m.form.Init()
+			}
 			m.loading = true
 			m.status = "Loading menu..."
 			return m, fetchMenuCmd(m.conn)