diff --git a/usr.sbin/bsdinstall/scripts/finalconfig b/usr.sbin/bsdinstall/scripts/finalconfig
--- a/usr.sbin/bsdinstall/scripts/finalconfig
+++ b/usr.sbin/bsdinstall/scripts/finalconfig
@@ -35,9 +35,9 @@
 while true; do
 	exec 5>&1
 	REVISIT=$(bsddialog --backtitle "$OSNAME Installer" \
-	    --title "Final Configuration" --no-cancel --menu \
+	    --title "Final Configuration" --ok-label "Select" \
+	    --cancel-label "Finish" --default-no --menu \
 	    "Setup of your $OSNAME system is nearly complete. You can now modify your configuration choices. After this screen, you will have an opportunity to make more complex changes using a shell." 0 0 0 \
-		"Exit" "Apply configuration and exit installer" \
 		"Add User" "Add a user to the system" \
 		"Root Password" "Change root password" \
 		"Hostname" "Set system hostname" \
@@ -49,6 +49,10 @@
 	retval=$?
 	exec 5>&-
 
+	if [ $retval -ne $BSDDIALOG_OK ]; then
+		break
+	fi
+
 	case "$REVISIT" in
 	"Add User")
 		bsdinstall adduser
@@ -74,8 +78,5 @@
 	"Handbook")
 		bsdinstall docsinstall
 		;;
-	*)
-		break
-		;;
 	esac
 done