diff --git a/plugins/avd/avd.plugin.zsh b/plugins/avd/avd.plugin.zsh
index 7470d690d..9e3b6138e 100644
--- a/plugins/avd/avd.plugin.zsh
+++ b/plugins/avd/avd.plugin.zsh
@@ -23,7 +23,9 @@ function find_emulator() {
 function avds() {
   local emulator_path
   emulator_path=$(find_emulator)
-  eval "$emulator_path -list-avds"
+
+  # Print all AVDs and prepend each output line with a number, starting at 1.
+  eval "$emulator_path -list-avds" | grep -n '^'
 }
 
 function avd() {