diff --git a/scripts/main.sh b/scripts/main.sh
index bb38fa3..179dbf5 100644
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -86,12 +86,6 @@ function configure_portage() {
 		try mirrorselect "${mirrorselect_params[@]}"
 	fi
 
-	if [[ $USE_PORTAGE_TESTING == "true" ]]; then
-		einfo "Adding ~$GENTOO_ARCH to ACCEPT_KEYWORDS"
-		echo "ACCEPT_KEYWORDS=\"~$GENTOO_ARCH\"" >> /etc/portage/make.conf \
-			|| die "Could not modify /etc/portage/make.conf"
-	fi
-
 	chmod 644 /etc/portage/make.conf \
 		|| die "Could not chmod 644 /etc/portage/make.conf"
 }
@@ -429,6 +423,15 @@ EOF
 		ewarn "Root password cleared, set one as soon as possible!"
 	fi
 
+	# If configured, change to gentoo testing at the last moment.
+	# This is to ensure a smooth installation process. You can deal
+	# with the blockers after installation ;)
+	if [[ $USE_PORTAGE_TESTING == "true" ]]; then
+		einfo "Adding ~$GENTOO_ARCH to ACCEPT_KEYWORDS"
+		echo "ACCEPT_KEYWORDS=\"~$GENTOO_ARCH\"" >> /etc/portage/make.conf \
+			|| die "Could not modify /etc/portage/make.conf"
+	fi
+
 	einfo "Gentoo installation complete."
 	[[ $USED_LUKS == "true" ]] \
 		&& einfo "A backup of your luks headers can be found at '$LUKS_HEADER_BACKUP_DIR', in case you want to have a backup."