diff --git a/internal/ui/option/option.go b/internal/ui/option/option.go
index c39d0dd..b257fae 100644
--- a/internal/ui/option/option.go
+++ b/internal/ui/option/option.go
@@ -25,6 +25,7 @@ type Model struct {
 	Panel Panel
 
 	state   *commit.State
+	focus   bool
 	section section.Model
 	setting setting.Model
 	help    help.Model
@@ -226,6 +227,15 @@ func (m Model) View() string {
 	return lipgloss.JoinHorizontal(lipgloss.Top, section, settingHelp)
 }
 
+func (m *Model) Focus() {
+	m.focus = true
+}
+
+func (m *Model) Blur() {
+	m.focus = false
+}
+
+
 func (m *Model) SetSettings(set []section.Setting) {
 	m.section.Settings = set
 }
diff --git a/internal/ui/ui.go b/internal/ui/ui.go
index ded6eb4..abb7984 100644
--- a/internal/ui/ui.go
+++ b/internal/ui/ui.go
@@ -369,6 +369,7 @@ func (m Model) resetModels() Model {
 	m.models.footer.Author = m.models.info.Author
 	m.models.footer.Signoff = m.signoff
 	m.models.help.Blur()
+	m.models.option.Blur()
 
 	return m
 }
@@ -398,6 +399,7 @@ func (m Model) setModels() Model {
 		m.models.help.Focus()
 	case optionComponent:
 		m.models.status.Shortcuts = status.OptionShortcuts()
+		m.models.option.Focus()
 	}
 
 	if m.signoff {