diff --git a/templates/grid.mustache b/templates/grid.mustache
index 71bf3734..d4613f75 100644
--- a/templates/grid.mustache
+++ b/templates/grid.mustache
@@ -78,7 +78,7 @@
         {{^notavailable}}<a href="{{sectionurl}}">{{/notavailable}}{{#notavailable}}<div>{{/notavailable}}
         {{/popup}}
         {{#popup}}
-        <div data-toggle="modal" data-target="#gridPopup" data-section="{{number}}">
+        <div class="grid-modal" data-toggle="modal" data-target="#gridPopup" data-section="{{number}}" tabindex="0">
         {{/popup}}
             <div class="card-header text-truncate">{{{sectionname}}}{{#notavailable}}
                 <div data-region="sectionbadges" class="sectionbadges d-flex">
@@ -89,7 +89,7 @@
             {{/notavailable}}</div>
             {{#imageuri}}
             <div class="grid-image card-img-bottom text-center">
-                <img src="{{imageuri}}" alt="{{imagealttext}}">
+                <img src="{{imageuri}}" alt="{{imagealttext}}" loading="lazy">
                 {{#sectioncompletionmarkup}}{{{sectioncompletionmarkup}}}{{/sectioncompletionmarkup}}
             </div>
             {{/imageuri}}