diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index c255d9652..a6cb2ccba 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -17,7 +17,7 @@ showHideContent.init();
 
 $(() => GOVUK.modules.start());
 
-$(() => $('.error-message').eq(0).parent('label').next('input').trigger('focus'));
+$(() => $('.error-message, .govuk-error-message').eq(0).parent('label').next('input').trigger('focus'));
 
 $(() => $('.banner-dangerous').eq(0).trigger('focus'));