diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp
index eb6f9e61b7..831b37c287 100644
--- a/src/kits/tracker/FSUtils.cpp
+++ b/src/kits/tracker/FSUtils.cpp
@@ -695,9 +695,11 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry, const char *ifYouDoAction
 	warning.ReplaceFirst("%ifYouDoAction", ifYouDoAction);
 	warning.ReplaceFirst("%toDoAction", toDoAction);
 
-	if ((new OverrideAlert("", warning.String(), B_TRANSLATE("Do it"),
-			(requireOverride ? B_SHIFT_KEY : 0), B_TRANSLATE("Cancel"),	0, NULL,
-			0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go() == 1) {
+	OverrideAlert *alert = new OverrideAlert("", warning.String(),
+		B_TRANSLATE("Do it"), (requireOverride ? B_SHIFT_KEY : 0),
+		B_TRANSLATE("Cancel"), 0, NULL, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+	alert->SetShortcut(1, B_ESCAPE);
+	if (alert->Go() == 1) {
 		if (confirmedAlready)
 			*confirmedAlready = kNotConfirmed;
 		return false;
diff --git a/src/preferences/locale/LocaleWindow.cpp b/src/preferences/locale/LocaleWindow.cpp
index 0642552e2a..be653de4b5 100644
--- a/src/preferences/locale/LocaleWindow.cpp
+++ b/src/preferences/locale/LocaleWindow.cpp
@@ -425,6 +425,7 @@ LocaleWindow::MessageReceived(BMessage* message)
 				"change to take effect. Would you like to restart them now?"),
 				B_TRANSLATE("Cancel"), B_TRANSLATE("Restart"), NULL,
 				B_WIDTH_FROM_WIDEST, B_IDEA_ALERT);
+			alert->SetShortcut(0, B_ESCAPE);
 			alert->Go(new BInvoker(new BMessage(kMsgRestartTrackerAndDeskbar),
 				NULL, be_app));
 			break;