diff --git a/src/kits/tracker/FilePanelPriv.cpp b/src/kits/tracker/FilePanelPriv.cpp
index 9010df4418..cebc6767ed 100644
--- a/src/kits/tracker/FilePanelPriv.cpp
+++ b/src/kits/tracker/FilePanelPriv.cpp
@@ -1390,15 +1390,15 @@ TFilePanel::ShowCenteredAlert(const char *text, const char *button1,
 		B_WIDTH_AS_USUAL, B_WARNING_ALERT);
 	alert->MoveTo(Frame().left + 10, Frame().top + 10);
 
-	if (strncmp(button1, "Cancel", 7))
+#if 0
+	if (button1 != NULL && !strncmp(button1, "Cancel", 7))
 		alert->SetShortcut(0, B_ESCAPE);
-
-	if (strncmp(button2, "Cancel", 7))
+	else if (button2 != NULL && !strncmp(button2, "Cancel", 7))
 		alert->SetShortcut(1, B_ESCAPE);
-
-	if (strncmp(button3, "Cancel", 7))
+	else if (button3 != NULL && !strncmp(button3, "Cancel", 7))
 		alert->SetShortcut(2, B_ESCAPE);	
-	
+#endif
+
 	return alert->Go();
 }