diff --git a/ChangeLog b/ChangeLog
index d8c20016a..78271d448 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2021-06-02  Oliver Kiddle  <opk@zsh.org>
 
+	* Akinori MUSHA: 48942: Functions/Zle/edit-command-line:
+	Let EDITOR invoked by edit-command-line know it's a zsh script
+
 	* 48954: Src/Zle/complist.c: avoid crash in reverse-menu-complete
 	from menuselect without 'menu' in $compstate[insert]
 
diff --git a/Functions/Zle/edit-command-line b/Functions/Zle/edit-command-line
index 3781244b2..5f7ea321f 100644
--- a/Functions/Zle/edit-command-line
+++ b/Functions/Zle/edit-command-line
@@ -8,6 +8,7 @@
 
 emulate -L zsh
 local left right prebuffer buffer=$BUFFER lbuffer=$LBUFFER
+local TMPSUFFIX=.zsh
 # set up parameters depending on which context we are called from,
 # see below comment for more details
 if (( REGION_ACTIVE )); then