diff --git a/compose-table/src/androidTest/java/org/dhis2/composetable/CellTableTest.kt b/compose-table/src/androidTest/java/org/dhis2/composetable/CellTableTest.kt
index aed210b4cc..ecd24f51e2 100644
--- a/compose-table/src/androidTest/java/org/dhis2/composetable/CellTableTest.kt
+++ b/compose-table/src/androidTest/java/org/dhis2/composetable/CellTableTest.kt
@@ -105,13 +105,14 @@ class CellTableTest {
             composeTestRule.waitForIdle()
             clickOnAccept()
             composeTestRule.waitForIdle()
+            Espresso.pressBack()
             assertCellSelected(firstId, 1, 0)
             clickOnCell(firstId, 1, 0)
             assertInputComponentInfo(
                 expectedMainLabel = "Text 2",
                 expectedSecondaryLabels =
                 fakeModel.find { it.id == firstId }?.tableHeaderModel?.rows
-                    ?.joinToString(separator = ",") { it.cells[0].value } ?: ""
+                    ?.joinToString(separator = ",") { it.cells[0 % it.cells.size].value } ?: ""
             )
         }
     }