diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp
index 9bb647eeb0..4240980fdc 100644
--- a/src/apps/expander/ExpanderWindow.cpp
+++ b/src/apps/expander/ExpanderWindow.cpp
@@ -196,18 +196,18 @@ ExpanderWindow::ValidateDest()
 		BAlert* alert = new BAlert("destAlert",
 			B_TRANSLATE("Destination folder doesn't exist. "
 				"Would you like to create it?"),
-			B_TRANSLATE("Create"), B_TRANSLATE("Cancel"), NULL,
-			B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
+			B_TRANSLATE("Cancel"), B_TRANSLATE("Create"), NULL,
+			B_WIDTH_AS_USUAL, B_INFO_ALERT);
 		alert->SetShortcut(0, B_ESCAPE);
 
-		if (alert->Go() != 0)
+		if (alert->Go() == 0)
 			return false;
 
 		if (create_directory(fDestText->Text(), 0755) != B_OK) {
-			BAlert* alert = new BAlert("stopAlert",
+			BAlert* alert = new BAlert("destAlert",
 				B_TRANSLATE("Failed to create the destination folder."),
-				B_TRANSLATE("Cancel"), NULL, NULL,
-				B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
+				B_TRANSLATE("OK"), NULL, NULL,
+				B_WIDTH_AS_USUAL, B_WARNING_ALERT);
 			alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
 			alert->Go();
 			return false;
@@ -216,14 +216,13 @@ ExpanderWindow::ValidateDest()
 		BEntry newEntry(fDestText->Text(), true);
 		newEntry.GetRef(&fDestRef);
 		return true;
-
 	}
 
 	if (!entry.IsDirectory()) {
 		BAlert* alert = new BAlert("destAlert",
 			B_TRANSLATE("The destination is not a folder."),
-			B_TRANSLATE("Cancel"), NULL, NULL,
-			B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
+			B_TRANSLATE("OK"), NULL, NULL,
+			B_WIDTH_AS_USUAL, B_WARNING_ALERT);
 		alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
 		alert->Go();
 		return false;
@@ -232,8 +231,8 @@ ExpanderWindow::ValidateDest()
 	if (entry.GetVolume(&volume) != B_OK || volume.IsReadOnly()) {
 		BAlert* alert = new BAlert("destAlert",
 			B_TRANSLATE("The destination is read only."),
-			B_TRANSLATE("Cancel"), NULL, NULL, B_WIDTH_AS_USUAL,
-			B_EVEN_SPACING,	B_WARNING_ALERT);
+			B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
+			B_WARNING_ALERT);
 		alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
 		alert->Go();
 		return false;