diff --git a/src/terminal.go b/src/terminal.go
index 44c58595..07f52d60 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -847,6 +847,10 @@ func (t *Terminal) environ() []string {
 	if t.listenPort != nil {
 		env = append(env, fmt.Sprintf("FZF_PORT=%d", *t.listenPort))
 	}
+	if t.clickHeaderLine > 0 {
+		env = append(env, fmt.Sprintf("FZF_CLICK_HEADER_LINE=%d", t.clickHeaderLine))
+		env = append(env, fmt.Sprintf("FZF_CLICK_HEADER_COLUMN=%d", t.clickHeaderColumn))
+	}
 	env = append(env, "FZF_QUERY="+string(t.input))
 	env = append(env, "FZF_ACTION="+t.lastAction.Name())
 	env = append(env, "FZF_KEY="+t.lastKey)
@@ -859,8 +863,6 @@ func (t *Terminal) environ() []string {
 	env = append(env, fmt.Sprintf("FZF_LINES=%d", t.areaLines))
 	env = append(env, fmt.Sprintf("FZF_COLUMNS=%d", t.areaColumns))
 	env = append(env, fmt.Sprintf("FZF_POS=%d", util.Min(t.merger.Length(), t.cy+1)))
-	env = append(env, fmt.Sprintf("FZF_CLICK_HEADER_LINE=%d", t.clickHeaderLine))
-	env = append(env, fmt.Sprintf("FZF_CLICK_HEADER_COLUMN=%d", t.clickHeaderColumn))
 	return env
 }
 
@@ -4040,7 +4042,10 @@ func (t *Terminal) Loop() {
 							t.clickHeaderLine = my + 1
 							t.clickHeaderColumn = mx + 1
 							evt := tui.ClickHeader
-							return doActions(actionsFor(evt))
+							res := doActions(actionsFor(evt))
+							t.clickHeaderLine = 0
+							t.clickHeaderColumn = 0
+							return res
 						}
 					}
 				}