diff --git a/git-p4.py b/git-p4.py
index 0009d733f6..6ce88ffb51 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -994,7 +994,7 @@ def edit_template(self, template_file):
         mtime = os.stat(template_file).st_mtime
 
         # invoke the editor
-        if os.environ.has_key("P4EDITOR"):
+        if os.environ.has_key("P4EDITOR") and (os.environ.get("P4EDITOR") != ""):
             editor = os.environ.get("P4EDITOR")
         else:
             editor = read_pipe("git var GIT_EDITOR").strip()