diff --git a/main.go b/main.go
index db47509032aabfa7c0bb18877aa782271a50921d..066c2d37cb3804a2f1c55b87b3871189f46d85df 100644
--- a/main.go
+++ b/main.go
@@ -176,7 +176,8 @@ func (m *mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.current = m.previousModel
 			m.previousModel = nil
 		}
-		return m, nil
+		m.current, cmd = m.current.Update(msg)
+		cmds = append(cmds, cmd)
 
 	case tui.SendEmailMsg:
 		m.cachedComposer = nil // Clear cache on successful send