diff --git a/pkg/surveyext/editor.go b/pkg/surveyext/editor.go
index e49e9a6a7..003a96e5c 100644
--- a/pkg/surveyext/editor.go
+++ b/pkg/surveyext/editor.go
@@ -26,6 +26,9 @@ func init() {
 	if runtime.GOOS == "windows" {
 		editor = "notepad"
 	}
+	if g := os.Getenv("GIT_EDITOR"); g != "" {
+		editor = g
+	}
 	if v := os.Getenv("VISUAL"); v != "" {
 		editor = v
 	}