diff --git a/src/command_manager.cc b/src/command_manager.cc
index 3c59dbc9f..e60a5dc8f 100644
--- a/src/command_manager.cc
+++ b/src/command_manager.cc
@@ -208,6 +208,7 @@ Completions CommandManager::complete(const String& command_line, size_t cursor_p
             if (command.first.substr(0, prefix.length()) == prefix)
                 result.candidates.push_back(command.first);
         }
+        std::sort(result.candidates.begin(), result.candidates.end());
 
         return result;
     }