diff --git a/tig-benchmarker/master/master/job_manager.py b/tig-benchmarker/master/master/job_manager.py
index 49544744..626b9e6e 100644
--- a/tig-benchmarker/master/master/job_manager.py
+++ b/tig-benchmarker/master/master/job_manager.py
@@ -223,9 +223,9 @@ class JobManager:
         get_db_conn().execute(
             """
             UPDATE job
-            SET stopped = true
-            WHERE end_time IS NULL
-                AND stopped IS NULL
+            SET stopped = true,
+                end_time = (EXTRACT(EPOCH FROM NOW()) * 1000)::BIGINT
+            WHERE (stopped IS NULL OR end_time IS NULL)
                 AND %s >= block_started + 120
             """,
             (block.details.height,)
diff --git a/tig-benchmarker/ui/src/app/pages/home/home.component.html b/tig-benchmarker/ui/src/app/pages/home/home.component.html
index 04052e5f..6dab9ebc 100644
--- a/tig-benchmarker/ui/src/app/pages/home/home.component.html
+++ b/tig-benchmarker/ui/src/app/pages/home/home.component.html
@@ -101,7 +101,6 @@
         </th>
 
         <th pSortableColumn="status" class="tig-dark text-center">STATUS</th>
-        <th pSortableColumn="num_attempts" class="tig-dark text-center">#ATTEMPTS</th>
         <th pSortableColumn="time_elapsed" class="tig-dark text-center">
           ELAPSED
         </th>
@@ -223,6 +222,7 @@
                   <th pSortableColumn="status" class="tig-dark text-center">
                     STATUS
                   </th>
+                  <th pSortableColumn="num_attempts" class="tig-dark text-center">#ATTEMPTS</th>
                   <th pSortableColumn="status" class="tig-dark text-center">
                     ELAPSED
                   </th>