diff --git a/site/app.js b/site/app.js
index 4092ae744b..93be992c14 100644
--- a/site/app.js
+++ b/site/app.js
@@ -240,16 +240,20 @@
       html += '<div class="modal-lesson' + (userComplete ? ' user-done' : '') + '">';
       html += '<span class="modal-lesson-status ' + statusClass + '"' + (userComplete ? ' title="You completed this lesson"' : '') + '></span>';
       if (l.url) {
-        html += '<a href="' + l.url + '" target="_blank" rel="noopener">' + escapeHtml(l.name) + '</a>';
+        if (lessonPath) {
+          html += '<a href="lesson.html?path=' + encodeURIComponent(lessonPath) + '">' + escapeHtml(l.name) + '</a>';
+        } else {
+          html += '<a href="' + l.url + '" target="_blank" rel="noopener">' + escapeHtml(l.name) + '</a>';
+        }
       } else {
-        html += '<a>' + escapeHtml(l.name) + '</a>';
+        html += '<span>' + escapeHtml(l.name) + '</span>';
       }
       html += '<span class="modal-lesson-type" data-type="' + escapeHtml(l.type) + '"' + (l.combines ? ' title="Combines: ' + escapeHtml(l.combines) + '"' : '') + '>' + escapeHtml(l.type) + '</span>';
       html += '<span class="modal-lesson-lang">' + escapeHtml(l.lang) + '</span>';
 
       var actionHtml = '';
-      if ((l.status === 'complete' || userComplete) && lessonPath) {
-        actionHtml = '<a href="lesson.html?path=' + lessonPath + '" class="modal-lesson-read">' + (userComplete ? 'Review' : 'Read') + '</a>';
+      if (l.url && lessonPath) {
+        actionHtml = '<a href="' + l.url + '" target="_blank" rel="noopener" class="modal-lesson-read modal-lesson-github" title="View source on GitHub">GitHub</a>';
       }
       var toggleHtml = '';
       if (hasProgress && lessonPath) {
diff --git a/site/catalog.html b/site/catalog.html
index 7369cc649b..e9e2c7c02e 100644
--- a/site/catalog.html
+++ b/site/catalog.html
@@ -192,6 +192,17 @@
       font-size: 1.1rem;
     }
 
+    .catalog-github-link {
+      font-size: 0.75rem;
+      text-decoration: none;
+      opacity: 0.5;
+      transition: opacity 0.15s;
+    }
+
+    .catalog-github-link:hover {
+      opacity: 1;
+    }
+
     @media (max-width: 768px) {
       .catalog-page {
         padding: 80px 0 48px;
@@ -348,6 +359,7 @@ <h1>Lesson Catalog</h1>
 
           for (var j = 0; j < p.lessons.length; j++) {
             var l = p.lessons[j];
+            var pathMatch = l.url ? l.url.match(/(phases\/[^/]+\/[^/]+)\/?$/) : null;
             allRows.push({
               phase: p.id,
               phaseName: p.name,
@@ -355,7 +367,8 @@ <h1>Lesson Catalog</h1>
               type: l.type,
               lang: l.lang,
               status: l.status,
-              url: l.url || ''
+              url: l.url || '',
+              lessonPath: pathMatch ? pathMatch[1] : ''
             });
           }
         }
@@ -425,7 +438,13 @@ <h1>Lesson Catalog</h1>
             var r = rows[i];
             html += '<tr>';
             html += '<td><span class="catalog-phase-label">' + String(r.phase).padStart(2, '0') + '</span></td>';
-            if (r.url) {
+            if (r.lessonPath) {
+              html += '<td><a href="lesson.html?path=' + encodeURIComponent(r.lessonPath) + '">' + escapeHtml(r.name) + '</a>';
+              if (r.url) {
+                html += ' <a href="' + r.url + '" target="_blank" rel="noopener" class="catalog-github-link" title="View source on GitHub" aria-label="Open lesson source on GitHub (new tab)">↗</a>';
+              }
+              html += '</td>';
+            } else if (r.url) {
               html += '<td><a href="' + r.url + '" target="_blank" rel="noopener">' + escapeHtml(r.name) + '</a></td>';
             } else {
               html += '<td>' + escapeHtml(r.name) + '</td>';
diff --git a/site/style.css b/site/style.css
index 1f82682249..e4259762c2 100644
--- a/site/style.css
+++ b/site/style.css
@@ -709,6 +709,19 @@ p.dropcap::first-letter {
   border-bottom: 1px solid var(--blueprint);
 }
 
+.modal-lesson .modal-lesson-github {
+  font-size: 0.68rem;
+  color: var(--ink-mute);
+  opacity: 0.6;
+  transition: opacity 0.15s, color 0.15s;
+}
+
+.modal-lesson .modal-lesson-github:hover {
+  opacity: 1;
+  color: var(--blueprint);
+  border-color: var(--rule-soft);
+}
+
 .modal-lesson-read-placeholder {
   display: inline-block;
   width: 64px;