diff --git a/templates/timesheet-team/index.html.twig b/templates/timesheet-team/index.html.twig
index b6317ef8..cdd948e6 100644
--- a/templates/timesheet-team/index.html.twig
+++ b/templates/timesheet-team/index.html.twig
@@ -45,7 +45,7 @@
         {{ tables.data_table_header(tableName, columns, false, 'kimai.timesheetUpdate') }}
 
         {% for entry in entries %}
-            <tr{% if is_granted('edit', entry) %} class="modal-ajax-form open-edit" data-href="{{ path('admin_timesheet_edit', {'id': entry.id}) }}"{% endif %}>
+            <tr{% if is_granted('edit', entry) %} class="modal-ajax-form open-edit{% if not entry.end %} recording{% endif %}" data-href="{{ path('admin_timesheet_edit', {'id': entry.id}) }}"{% endif %}>
                 <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'date') }}">{{ entry.begin|date_short }}</td>
 
                 {% if showStartEndTime %}
diff --git a/templates/timesheet/index.html.twig b/templates/timesheet/index.html.twig
index d54803d4..3a51e761 100644
--- a/templates/timesheet/index.html.twig
+++ b/templates/timesheet/index.html.twig
@@ -60,7 +60,7 @@
                 {% set dayDuration = 0 %}
                 {% set dayRate = {} %}
             {%- endif -%}
-            <tr{% if is_granted('edit', entry) %} class="modal-ajax-form open-edit" data-href="{{ path('timesheet_edit', {'id': entry.id}) }}"{% endif %}>
+            <tr{% if is_granted('edit', entry) %} class="modal-ajax-form open-edit{% if not entry.end %} recording{% endif %}" data-href="{{ path('timesheet_edit', {'id': entry.id}) }}"{% endif %}>
                 <td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'date') }}">{{ entry.begin|date_short }}</td>
 
                 {% if showStartEndTime %}
diff --git a/tests/Controller/TimesheetControllerTest.php b/tests/Controller/TimesheetControllerTest.php
index da99e604..80ec1bd7 100644
--- a/tests/Controller/TimesheetControllerTest.php
+++ b/tests/Controller/TimesheetControllerTest.php
@@ -53,6 +53,7 @@ class TimesheetControllerTest extends ControllerBaseTest
         $em = $client->getContainer()->get('doctrine.orm.entity_manager');
         $fixture = new TimesheetFixtures();
         $fixture->setAmount(5);
+        $fixture->setAmountRunning(2);
         $fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
         $fixture->setStartDate($start);
         $this->importFixture($em, $fixture);
@@ -72,7 +73,11 @@ class TimesheetControllerTest extends ControllerBaseTest
 
         $this->assertTrue($client->getResponse()->isSuccessful());
         $this->assertHasDataTable($client);
-        $this->assertDataTableRowCount($client, 'datatable_timesheet', 5);
+        $this->assertDataTableRowCount($client, 'datatable_timesheet', 7);
+
+        // make sure the recording css class exist on tr for targeting running record rows
+        $node = $client->getCrawler()->filter('section.content div#datatable_timesheet table.table-striped tbody tr.recording');
+        self::assertEquals(2, $node->count());
     }
 
     public function testExportAction()
diff --git a/tests/Controller/TimesheetTeamControllerTest.php b/tests/Controller/TimesheetTeamControllerTest.php
index 69d0d26f..64bff538 100644
--- a/tests/Controller/TimesheetTeamControllerTest.php
+++ b/tests/Controller/TimesheetTeamControllerTest.php
@@ -55,6 +55,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
         $user = $this->getUserByRole($em, User::ROLE_USER);
         $fixture = new TimesheetFixtures();
         $fixture->setAmount(10);
+        $fixture->setAmountRunning(3);
         $fixture->setUser($user);
         $fixture->setStartDate($start);
         $this->importFixture($em, $fixture);
@@ -75,7 +76,11 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
 
         $this->assertTrue($client->getResponse()->isSuccessful());
         $this->assertHasDataTable($client);
-        $this->assertDataTableRowCount($client, 'datatable_timesheet_admin', 10);
+        $this->assertDataTableRowCount($client, 'datatable_timesheet_admin', 13);
+
+        // make sure the recording css class exist on tr for targeting running record rows
+        $node = $client->getCrawler()->filter('section.content div#datatable_timesheet_admin table.table-striped tbody tr.recording');
+        self::assertEquals(3, $node->count());
     }
 
     public function testExportAction()