diff --git a/gclient_utils.py b/gclient_utils.py
index 21c44c36a..9d1b9dfdd 100644
--- a/gclient_utils.py
+++ b/gclient_utils.py
@@ -1084,7 +1084,11 @@ def RunEditor(content, git, git_editor=None):
         '!! Please remove \\r from your change description !!')
   fileobj = os.fdopen(file_handle, 'w')
   # Still remove \r if present.
-  fileobj.write(re.sub('\r?\n', '\n', content))
+  content = re.sub('\r?\n', '\n', content)
+  # Some editors complain when the file doesn't end in \n.
+  if not content.endswith('\n'):
+    content += '\n'
+  fileobj.write(content)
   fileobj.close()
 
   try: