diff --git a/.gitignore b/.gitignore
index 57afa319e..9706b9000 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ env.yml-original
 .env
 !configurations/test/env.yml
 scripts/*client.json
+
+# Vs code settings
+.vscode/
diff --git a/lib/editor/selectors/timetable.js b/lib/editor/selectors/timetable.js
index 33bdb205f..75f6a7463 100644
--- a/lib/editor/selectors/timetable.js
+++ b/lib/editor/selectors/timetable.js
@@ -4,14 +4,12 @@ import objectPath from 'object-path'
 
 import { getAbbreviatedStopName, getTableById } from '../util/gtfs'
 import { isTimeFormat } from '../util/timetable'
-
 import type {
   GtfsStop,
   Pattern,
   TimetableColumn,
   Trip
 } from '../../types'
-
 import type { AppState } from '../../types/reducers'
 import type { EditorValidationIssue } from '../util/validation'
 
@@ -152,7 +150,7 @@ const isCellValueInvalid = (
       let previousValue = null
       let previousIndex = colIndex - 1
       // Find previous stop time
-      while (previousValue === null && previousIndex >= 0) {
+      while (previousValue === null && previousIndex >= 0 && (columns[previousIndex].type === 'ARRIVAL_TIME' || columns[previousIndex].type === 'DEPARTURE_TIME')) {
         const previousCol = columns[previousIndex]
         previousValue = previousCol && row && objectPath.get(row, previousCol.key)
         previousIndex--