diff --git a/.last-branch b/.last-branch
index 89f73d5..b69a15b 100644
--- a/.last-branch
+++ b/.last-branch
@@ -1 +1 @@
-v20260106-04-jobs-archive
+v20260106-05-jobs-row-click-and-archive-button-move
diff --git a/containers/backupchecks/src/templates/main/job_detail.html b/containers/backupchecks/src/templates/main/job_detail.html
index 382a7bc..a7e062f 100644
--- a/containers/backupchecks/src/templates/main/job_detail.html
+++ b/containers/backupchecks/src/templates/main/job_detail.html
@@ -48,9 +48,15 @@
 </div>
 
 {% if can_manage_jobs %}
-<form method="post" action="{{ url_for('main.job_delete', job_id=job.id) }}" class="mb-3" onsubmit="return confirm('Are you sure you want to delete this job? Related mails will be returned to the Inbox.');">
-  <button type="submit" class="btn btn-outline-danger">Delete job</button>
-</form>
+<div class="d-flex flex-wrap gap-2 mb-3">
+  <form method="post" action="{{ url_for('main.archive_job', job_id=job.id) }}" class="mb-0" onsubmit="return confirm('Archive this job? No new runs are expected and it will be removed from Daily Jobs and Run Checks.');">
+    <button type="submit" class="btn btn-outline-secondary">Archive</button>
+  </form>
+
+  <form method="post" action="{{ url_for('main.job_delete', job_id=job.id) }}" class="mb-0" onsubmit="return confirm('Are you sure you want to delete this job? Related mails will be returned to the Inbox.');">
+    <button type="submit" class="btn btn-outline-danger">Delete job</button>
+  </form>
+</div>
 {% endif %}
 
 <h3 class="mt-4 mb-3">Job history</h3>
diff --git a/containers/backupchecks/src/templates/main/jobs.html b/containers/backupchecks/src/templates/main/jobs.html
index 0fc8d31..8240d12 100644
--- a/containers/backupchecks/src/templates/main/jobs.html
+++ b/containers/backupchecks/src/templates/main/jobs.html
@@ -10,33 +10,21 @@
         <th scope="col">Backup</th>
         <th scope="col">Type</th>
         <th scope="col">Job name</th>
-        {% if can_manage_jobs %}
-        <th scope="col" class="text-end">Actions</th>
-        {% endif %}
       </tr>
     </thead>
     <tbody>
       {% if jobs %}
         {% for j in jobs %}
-          <tr>
+          <tr class="job-row" data-href="{{ url_for('main.job_detail', job_id=j.id) }}" style="cursor: pointer;">
             <td>{{ j.customer_name }}</td>
             <td>{{ j.backup_software }}</td>
             <td>{{ j.backup_type }}</td>
-            <td>
-              <a class="text-decoration-none" href="{{ url_for('main.job_detail', job_id=j.id) }}">{{ j.job_name }}</a>
-            </td>
-            {% if can_manage_jobs %}
-            <td class="text-end">
-              <form method="post" action="{{ url_for('main.archive_job', job_id=j.id) }}" style="display:inline;">
-                <button type="submit" class="btn btn-sm btn-outline-secondary">Archive</button>
-              </form>
-            </td>
-            {% endif %}
+            <td>{{ j.job_name }}</td>
           </tr>
         {% endfor %}
       {% else %}
         <tr>
-          <td colspan="{% if can_manage_jobs %}5{% else %}4{% endif %}" class="text-center text-muted py-3">
+          <td colspan="4" class="text-center text-muted py-3">
             No jobs found.
           </td>
         </tr>
@@ -44,4 +32,24 @@
     </tbody>
   </table>
 </div>
+
+<script>
+  (function () {
+    function onRowClick(e) {
+      // Don't navigate when clicking interactive elements inside the row.
+      if (e.target.closest('a, button, input, select, textarea, label, form')) {
+        return;
+      }
+
+      var href = this.getAttribute('data-href');
+      if (href) {
+        window.location.href = href;
+      }
+    }
+
+    document.querySelectorAll('tr.job-row[data-href]').forEach(function (row) {
+      row.addEventListener('click', onRowClick);
+    });
+  })();
+</script>
 {% endblock %}
diff --git a/docs/changelog.md b/docs/changelog.md
index fccf903..dc1de2f 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -29,6 +29,14 @@
 - Introduced an Admin-only Archived Jobs page to view and restore archived jobs.
 - Archived job runs remain fully included in all reports and statistics to preserve historical accuracy.
 
+---
+
+## v20260106-05-jobs-row-click-and-archive-button-move
+
+- Restored the original Jobs page behavior where clicking anywhere on a job row navigates to the Job Details page.
+- Removed the Job name hyperlink from the Jobs table; navigation is now handled by row click again.
+- Moved the Archive action from the Jobs table to the Job Details page.
+- Placed the Archive button next to the existing Delete job button for better consistency.
 
 ================================================================================================================================================
 ## v0.1.16