diff --git a/client/package.json b/client/package.json
index 05700d8ef..47b9ab33f 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ontime-ui",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "private": true,
   "dependencies": {
     "@chakra-ui/react": "^2.3.2",
diff --git a/client/src/features/table/TableHeader.jsx b/client/src/features/table/TableHeader.jsx
index c65d29e1a..69cde8b3b 100644
--- a/client/src/features/table/TableHeader.jsx
+++ b/client/src/features/table/TableHeader.jsx
@@ -102,7 +102,7 @@ TableHeader.propTypes = {
   featureData: PropTypes.shape({
     playback: PropTypes.string,
     selectedEventId: PropTypes.string,
-    selectedEventIndex: PropTypes.string,
+    selectedEventIndex: PropTypes.number,
     numEvents: PropTypes.number,
     titleNow: PropTypes.string,
   }),
diff --git a/client/src/features/table/tableElements/EditableCell.jsx b/client/src/features/table/tableElements/EditableCell.jsx
index 6806180e0..484b49a70 100644
--- a/client/src/features/table/tableElements/EditableCell.jsx
+++ b/client/src/features/table/tableElements/EditableCell.jsx
@@ -1,8 +1,8 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useContext, useEffect, useState } from 'react';
+import { AutoTextArea } from 'common/components/input/AutoTextArea';
+import { TableSettingsContext } from 'common/context/TableSettingsContext';
 import PropTypes from 'prop-types';
 
-import { AutoTextArea } from '../../../common/components/input/AutoTextArea';
-
 /**
  * Shamelessly copied from react-table docs
  * Plugged into chakra-ui editable component
@@ -18,6 +18,7 @@ export default function EditableCell(props) {
     column: { id },
     handleUpdate,
   } = props;
+  const { theme } = useContext(TableSettingsContext);
 
   // We need to keep and update the state of the cell normally
   const [value, setValue] = useState(initialValue);
@@ -43,6 +44,7 @@ return (
     rows={3}
     transition='none'
     spellCheck={false}
+    color={theme === "dark" ? "#fffffa" : "black"}
   />
 );
 }
diff --git a/server/package.json b/server/package.json
index 89b2f101d..6d0113e05 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "author": "Carlos Valente",
   "description": "Time keeping for live events",
   "repository": "https://github.com/cpvalente/ontime",