diff --git a/ChangeLog b/ChangeLog
index ee707fa45..fdc824bd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 ------ current release ---------------------------
 
 1.8.4 ()
+ + Fixed bug that caused wait: dates to not be properly rendered in a
+   readable and preferred format with the "edit" command.
 
 ------ old releases ------------------------------
 
diff --git a/src/edit.cpp b/src/edit.cpp
index c7e1e94fd..48112538d 100644
--- a/src/edit.cpp
+++ b/src/edit.cpp
@@ -150,7 +150,7 @@ static std::string formatTask (Task task)
          << "  Due:               " << formatDate (task, "due")                         << std::endl
          << "  Until:             " << formatDate (task, "until")                       << std::endl
          << "  Recur:             " << task.get ("recur")                               << std::endl
-         << "  Wait until:        " << task.get ("wait")                                << std::endl
+         << "  Wait until:        " << formatDate (task, "wait")                        << std::endl
          << "  Parent:            " << task.get ("parent")                              << std::endl
          << "  Foreground color:  " << task.get ("fg")                                  << std::endl
          << "  Background color:  " << task.get ("bg")                                  << std::endl