diff --git a/htdocs/js/GatewayQuiz/gateway.scss b/htdocs/js/GatewayQuiz/gateway.scss
index 06690c9c96..0b6dea7120 100644
--- a/htdocs/js/GatewayQuiz/gateway.scss
+++ b/htdocs/js/GatewayQuiz/gateway.scss
@@ -67,6 +67,7 @@ table.attemptResults {
 
 	h2.gw-problem-number {
 		display: inline-block;
+		outline: none;
 		font-size: 16px;
 		margin-right: 5px;
 		line-height: 1.8;
diff --git a/templates/ContentGenerator/GatewayQuiz.html.ep b/templates/ContentGenerator/GatewayQuiz.html.ep
index 4e07fededa..813a2a23fd 100644
--- a/templates/ContentGenerator/GatewayQuiz.html.ep
+++ b/templates/ContentGenerator/GatewayQuiz.html.ep
@@ -614,10 +614,9 @@
 				% }
 				%
 				<div class="gwProblem">
-					% # Show the jump to anchor.
-					<div id="<%= "prob$i" %>" tabindex="-1"><%= $recordMessage %></div>
-					% # Output the problem header.
-					<h2 class="gw-problem-number"><%= maketext('Problem [_1].', $i + 1) %></h2>
+					<h2 id="<%= "prob$i" %>" class="gw-problem-number" tabindex="-1">
+						<%= maketext('Problem [_1].', $i + 1) %>
+					</h2>
 					<span class="problem-sub-header">
 						% if ($c->{can}{showTemplateIds}) {
 							<%=
@@ -636,6 +635,9 @@
 							<%= $problems->[ $probOrder->[$i] ]->source_file %>
 						% }
 					</span>
+					% if ($recordMessage) {
+						<div><%= $recordMessage %></div>
+					% }
 					%
 					% my $instructor_comment = $c->get_instructor_comment($problems->[ $probOrder->[$i] ]);
 					% if ($instructor_comment) {