diff --git a/packages/tui/internal/components/dialog/theme.go b/packages/tui/internal/components/dialog/theme.go
index 2bbcebc7..f00b8d1f 100644
--- a/packages/tui/internal/components/dialog/theme.go
+++ b/packages/tui/internal/components/dialog/theme.go
@@ -89,8 +89,8 @@ func (t *themeDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	if item, newIdx := t.list.GetSelectedItem(); newIdx >= 0 && newIdx != prevIdx {
 		theme.SetTheme(item.name)
+		return t, util.CmdHandler(ThemeSelectedMsg{ThemeName: item.name})
 	}
-
 	return t, cmd
 }
 
diff --git a/packages/tui/internal/components/modal/modal.go b/packages/tui/internal/components/modal/modal.go
index afb67a95..98e34d62 100644
--- a/packages/tui/internal/components/modal/modal.go
+++ b/packages/tui/internal/components/modal/modal.go
@@ -114,7 +114,7 @@ func (m *Modal) Render(contentView string, background string) string {
 		titleLine := m.title + spacer + escText
 		titleLine = titleStyle.Render(titleLine)
 
-		finalContent = strings.Join([]string{titleLine, contentView}, "\n") + "\n"
+		finalContent = strings.Join([]string{titleLine, "", contentView}, "\n")
 	} else {
 		finalContent = contentView
 	}