--- before/script.js
+++ after/script.js
@@ -114,6 +114,11 @@
         <p class="project__meta">${p.meta}</p>
         <p class="project__desc">${p.desc}</p>
         <a href="#" class="project__link" aria-label="Dettagli progetto ${p.title}">Dettagli</a>`;
+      const link = article.querySelector('.project__link');
+      link.addEventListener('click', (e) => {
+        e.preventDefault();
+        openProject(p);
+      });
       grid.appendChild(article);
     });
     updateCount(filtered.length);
@@ -122,6 +127,7 @@
   function openProject(p) {
     const overlay = document.createElement('div');
     overlay.className = 'modal';
+    overlay.classList.add('modal--open');
     overlay.setAttribute('role', 'dialog');
     overlay.innerHTML =
       `<div class="modal__content">
@@ -139,6 +145,14 @@
       closeBtn.focus();
     }
 
+    // Handle Tab and Shift+Tab so focus stays on the close button
+    overlay.addEventListener('keydown', (e) => {
+      if (e.key === 'Tab' || e.key === 'Shift+Tab') {
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    });
+
     overlay.addEventListener('click', (e) => {
       if (e.target === overlay || e.target.classList.contains('modal__close')) {
         closeModal();
@@ -186,13 +200,7 @@
     renderProjects(category, query);
   }
 
-  document.querySelectorAll('.project__link').forEach((link) => {
-    link.addEventListener('click', (e) => {
-      e.preventDefault();
-      const article = link.closest('.project');
-      if (article) openProject(projects.find(p => p.id === article.dataset.id));
-    });
-  });
+
 
   const searchInput = document.getElementById('project-search');
   if (searchInput) {
