diff --git a/SourceX/DiabloUI/selhero.cpp b/SourceX/DiabloUI/selhero.cpp
index 6584bbcbf..902cfd4d2 100644
--- a/SourceX/DiabloUI/selhero.cpp
+++ b/SourceX/DiabloUI/selhero.cpp
@@ -52,7 +52,7 @@ UI_Item SELLIST_DIALOG[] = {
 	{ { 265, 360, 320, 26 }, UI_LIST, UIS_CENTER | UIS_MED | UIS_GOLD, 4, listItems[4] },
 	{ { 265, 386, 320, 26 }, UI_LIST, UIS_CENTER | UIS_MED | UIS_GOLD, 5, listItems[5] },
 	{ { 239, 429, 120, 35 }, UI_BUTTON, UIS_CENTER | UIS_BIG | UIS_GOLD, 0, "OK", (void *)UiFocusNavigationSelect },
-	{ { 364, 429, 120, 35 }, UI_BUTTON, UIS_CENTER | UIS_BIG | UIS_DISABLED, 0, "Delete", (void *)UiFocusNavigationYesNo },
+	{ { 364, 429, 120, 35 }, UI_BUTTON, UIS_CENTER | UIS_BIG | UIS_DISABLED, 0, "Delete", (void *)selhero_UiFocusNavigationYesNo },
 	{ { 489, 429, 120, 35 }, UI_BUTTON, UIS_CENTER | UIS_BIG | UIS_GOLD, 0, "Cancel", (void *)UiFocusNavigationEsc },
 };
 
@@ -80,6 +80,12 @@ UI_Item SELLOAD_DIALOG[] = {
 	{ { 429, 427, 140, 35 }, UI_BUTTON, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD, 0, "Cancel", (void *)UiFocusNavigationEsc },
 };
 
+void selhero_UiFocusNavigationYesNo()
+{
+	if (selhero_deleteEnabled)
+		UiFocusNavigationYesNo();
+}
+
 void selhero_Free()
 {
 	mem_free_dbg(ArtBackground.data);
diff --git a/SourceX/DiabloUI/selhero.h b/SourceX/DiabloUI/selhero.h
index 1bd5b236b..2556ced30 100644
--- a/SourceX/DiabloUI/selhero.h
+++ b/SourceX/DiabloUI/selhero.h
@@ -10,9 +10,9 @@ void selhero_List_Esc();
 void selhero_ClassSelector_Focus(int value);
 void selhero_ClassSelector_Select(int value);
 void selhero_ClassSelector_Esc();
+void selhero_UiFocusNavigationYesNo();
 void selhero_Name_Select(int value);
 void selhero_Name_Esc();
 void selhero_Load_Focus(int value);
 void selhero_Load_Select(int value);
-
 }