diff --git a/feature/sessions/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreenTest.kt b/feature/sessions/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreenTest.kt
index f813ac717..8dbe39273 100644
--- a/feature/sessions/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreenTest.kt
+++ b/feature/sessions/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreenTest.kt
@@ -185,9 +185,9 @@ class TimetableScreenTest(private val testCase: DescribedBehavior<TimetableScree
                         dateTime = LocalDateTime(
                             year = 2024,
                             monthNumber = 9,
-                            dayOfMonth = 12,
-                            hour = 16,
-                            minute = 45,
+                            dayOfMonth = 11,
+                            hour = 10,
+                            minute = 0,
                         ),
                         shouldShowTimeLine = false,
                     ),
@@ -196,51 +196,21 @@ class TimetableScreenTest(private val testCase: DescribedBehavior<TimetableScree
                             year = 2024,
                             monthNumber = 9,
                             dayOfMonth = 12,
-                            hour = 23,
-                            minute = 0,
+                            hour = 10,
+                            minute = 30,
                         ),
                         shouldShowTimeLine = true,
                     ),
-                ).forEach { case ->
-                    val formattedDateTime =
-                        case.dateTime.format(LocalDateTime.Format { byUnicodePattern("yyyy-MM-dd HH-mm") })
-                    describe("when the current datetime is $formattedDateTime") {
-                        doIt {
-                            setupTimetableServer(ServerStatus.Operational)
-                            setupTimetableScreenContent(case.dateTime)
-                        }
-
-                        val formattedTime =
-                            case.dateTime.time.format(LocalTime.Format { byUnicodePattern("HH-mm") })
-                        val description = "show an timetable item of the current time at $formattedTime"
-                        itShould(description) {
-                            captureScreenWithChecks {
-                                checkTimetableListDisplayed()
-                            }
-                        }
-                    }
-                }
-                listOf(
                     TimeLineTestSpec(
                         dateTime = LocalDateTime(
                             year = 2024,
                             monthNumber = 9,
-                            dayOfMonth = 11,
-                            hour = 10,
+                            dayOfMonth = 12,
+                            hour = 23,
                             minute = 0,
                         ),
                         shouldShowTimeLine = false,
                     ),
-                    TimeLineTestSpec(
-                        dateTime = LocalDateTime(
-                            year = 2024,
-                            monthNumber = 9,
-                            dayOfMonth = 12,
-                            hour = 10,
-                            minute = 30,
-                        ),
-                        shouldShowTimeLine = true,
-                    ),
                     TimeLineTestSpec(
                         dateTime = LocalDateTime(
                             year = 2024,
@@ -258,19 +228,28 @@ class TimetableScreenTest(private val testCase: DescribedBehavior<TimetableScree
                         doIt {
                             setupTimetableServer(ServerStatus.Operational)
                             setupTimetableScreenContent(case.dateTime)
-                            clickTimetableUiTypeChangeButton()
                         }
-
                         val formattedTime =
                             case.dateTime.time.format(LocalTime.Format { byUnicodePattern("HH-mm") })
-                        val description = if (case.shouldShowTimeLine) {
-                            "show an indicator of the current time at $formattedTime"
-                        } else {
-                            "not show an indicator of the current time"
-                        }
-                        itShould(description) {
+                        val timetableListDescription = "show an timetable item of the current time at $formattedTime"
+                        itShould(timetableListDescription) {
                             captureScreenWithChecks {
-                                checkTimetableGridDisplayed()
+                                checkTimetableListDisplayed()
+                            }
+                        }
+                        describe("switch to grid timetable") {
+                            doIt {
+                                clickTimetableUiTypeChangeButton()
+                            }
+                            val timetableGridDescription = if (case.shouldShowTimeLine) {
+                                "show an indicator of the current time at $formattedTime"
+                            } else {
+                                "not show an indicator of the current time"
+                            }
+                            itShould(timetableGridDescription) {
+                                captureScreenWithChecks {
+                                    checkTimetableGridDisplayed()
+                                }
                             }
                         }
                     }
diff --git a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/section/TimetableList.kt b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/section/TimetableList.kt
index 82f486158..022473864 100644
--- a/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/section/TimetableList.kt
+++ b/feature/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/section/TimetableList.kt
@@ -116,7 +116,7 @@ internal fun TimetableList(
             val progressingSessionIndex = uiState.timetableItemMap.keys
                 .insertDummyEndOfTheDayItem() // Insert dummy at a position after last session to allow scrolling
                 .windowed(2, 1, true)
-                .indexOfFirst { clock.now().toLocalTime() in it.first().startTime..it.last().startTime }
+                .indexOfFirst { clock.now().toLocalTime() in it.first().startTime..<it.last().startTime }
 
             progressingSessionIndex.takeIf { it != -1 }?.let {
                 scrollState.scrollToItem(it)