diff --git a/src/Controller/Controller_Actions.php b/src/Controller/Controller_Actions.php
index f8293b365..7d5bbf81c 100644
--- a/src/Controller/Controller_Actions.php
+++ b/src/Controller/Controller_Actions.php
@@ -155,8 +155,9 @@ public function route_notices() {
 		/* Prevent actions being displayed on our welcome pages */
 		$register_routes = false;
 		$is_gfpdf_page   = \GPDFAPI::get_misc_class()->is_gfpdf_page();
+		$is_gf_page = \GFForms::is_gravity_page();
 
-		if ( ! wp_doing_ajax() && is_admin() && ( $pagenow === 'plugins.php' || $is_gfpdf_page || \GFForms::is_gravity_page() ) ) {
+		if ( ! wp_doing_ajax() && is_admin() && ( $pagenow === 'plugins.php' || $is_gfpdf_page || $is_gf_page ) ) {
 			$register_routes = true;
 		}
 
@@ -188,7 +189,7 @@ public function route_notices() {
 				} else {
 					/* Add  Install Core font message GFCommon if it doesn't. Remove the font styling to match with the generic add-on error message. */
 					if ( ! empty( \GFCommon::$errors ) ) {
-						$message = '<br>' . preg_replace( '/(<[^>]+) style=".*?"/i', '$1', $message );
+						$message = sprintf( "<div>%s</div>", $message );
 					}
 					\GFCommon::add_error_message( $message );