diff --git a/ChangeLog b/ChangeLog
index 09bb79074..6740e2a5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,8 @@ Bugs
  + Fixed bug #1091, allowing filters to use 'urgency.over:4.5'.
  + Fixed bug #1110, which did not treat 'status:Completed' the same
    as 'status:completed' (thanks to Aikido Guy).
+ + Fixed bug #1118, which dropped changes after edits were rejected (thanks to
+   Ben Boeckel).
  + Fixed bug #1123, which caused the undo of a 'log' command to corrupt the data
    file (thanks to Tim None).
  + Fixed bug #1128, which caused 'age' columns to be right-justified instead of
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index 176c2eb09..3a8580d16 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -772,6 +772,7 @@ bool CmdEdit::editFile (Task& task)
 
   // Format the contents, T -> text, write to a file.
   std::string before = formatTask (task, dateformat);
+  std::string before_orig = before;
   File::write (file.str (), before);
 
   // Determine correct editor: .taskrc:editor > $VISUAL > $EDITOR > vi
@@ -802,7 +803,7 @@ ARE_THESE_REALLY_HARMFUL:
 
   // Update task based on what can be parsed back out of the file, but only
   // if changes were made.
-  if (before != after)
+  if (before_orig != after)
   {
     std::cout << STRING_EDIT_CHANGES << "\n";
     std::string problem = "";