diff --git a/src/commands.cc b/src/commands.cc
index 1b691ed14..1a8e8f73b 100644
--- a/src/commands.cc
+++ b/src/commands.cc
@@ -387,7 +387,8 @@ static void ensure_all_buffers_are_saved()
     if (it == end)
         return;
 
-    String message = "modified buffers remaining: [";
+    String message = format("{} modified buffers remaining: [",
+                            std::count_if(it, end, is_modified));
     while (it != end)
     {
         message += (*it)->name();