2 files changed, 4 insertions, 5 deletions
diff --git a/internal/client/tui/compose.go b/internal/client/tui/compose.go
index 4672462..d918677 100644
--- a/internal/client/tui/compose.go
+++ b/internal/client/tui/compose.go
@@ -31,8 +31,8 @@ func composeAction(conf config.ClientConfig, queue bool) tea.Cmd {
 func openEditor(editor, filePath string, cb func() error) tea.Cmd {
 	return tea.ExecProcess(exec.Command(editor, filePath), func(err error) tea.Msg {
 		return finishedMsg{
-			cb: cb,
-			err:      err,
+			cb:  cb,
+			err: err,
 		}
 	})
 }
diff --git a/internal/client/tui/tui.go b/internal/client/tui/tui.go
index 2f02910..b06f585 100644
--- a/internal/client/tui/tui.go
+++ b/internal/client/tui/tui.go
@@ -79,15 +79,14 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			case cursorSubmit:
 				return m, submitAction(m.ctx, m.conf)
 			case cursorComposeAndSubmit:
-				// TODO: Find out correct way how to chain two tea.Cmd's??
-				panic("not yet implemented")
+				return m, tea.Sequence(composeAction(m.conf, false), submitAction(m.ctx, m.conf))
 			}
 		case "1":
 			return m, composeAction(m.conf, false)
 		case "2":
 			return m, submitAction(m.ctx, m.conf)
 		case "3":
-			panic("not yet implemented")
+			return m, tea.Sequence(composeAction(m.conf, false), submitAction(m.ctx, m.conf))
 
 		case "a":
 			m.altscreenActive = !m.altscreenActive