diff --git a/default_recovery_ui.c b/default_recovery_ui.c
index 09bf19c..70ab619 100644
--- a/default_recovery_ui.c
+++ b/default_recovery_ui.c
@@ -27,8 +27,8 @@
                        "wipe data/factory reset",
                        "wipe cache partition",
                        "install zip from sdcard",
-                       "nandroid",
-                       "partitions menu",
+                       "backup and restore",
+                       "mounts and storage",
                        "advanced",
                        NULL };
 
diff --git a/extendedcommands.c b/extendedcommands.c
index 903df1d..507810b 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -813,9 +813,15 @@
             {
                 if (0 != ensure_root_path_mounted("DATA:"))
                     break;
-                if (confirm_selection( "Confirm wipe?", "Yes - Wipe Dalvik Cache"))
+                ensure_root_path_mounted("SDEXT:");
+                ensure_root_path_mounted("CACHE:");
+                if (confirm_selection( "Confirm wipe?", "Yes - Wipe Dalvik Cache")) {
                     __system("rm -r /data/dalvik-cache");
+                    __system("rm -r /cache/dalvik-cache");
+                    __system("rm -r /sd-ext/dalvik-cache");
+                }
                 ensure_root_path_unmounted("DATA:");
+                ui_print("Dalvik Cache wiped.\n");
                 break;
             }
             case 2: