diff --git a/android/gradle.properties b/android/gradle.properties
index 30298b3b3f04073678e48519b8c043edba635df8..6c1d873456149a8611e43a05ae56e4f50c73274f 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.18
-app.versionCode=18
+app.versionName=0.0.19
+app.versionCode=19
diff --git a/fastlane/metadata/android/en-US/changelogs/19.txt b/fastlane/metadata/android/en-US/changelogs/19.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5515a5348671ea4d525042d8c31e1d595448bc70
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/19.txt
@@ -0,0 +1 @@
+Display current typing cell
diff --git a/fastlane/metadata/android/fr-FR/changelogs/19.txt b/fastlane/metadata/android/fr-FR/changelogs/19.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0aff8228b6dfda945e519fbb3eee5aa6fc37823e
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/19.txt
@@ -0,0 +1 @@
+Mise en évidence de la case en cours de saisie
diff --git a/lib/layout/board.dart b/lib/layout/board.dart
index dd71a8b5905188c27b43b506ab6344b16eb2a23f..82313c546afaf1e7ff6f4fdc054f860e054fb7af 100644
--- a/lib/layout/board.dart
+++ b/lib/layout/board.dart
@@ -10,8 +10,10 @@ class Board {
     int maxGuessesCount = myProvider.maxGuessesCount;
     int wordLength = int.parse(myProvider.length);
 
-    Widget buildCellWidget(String cellValue, String cellTip) {
+    Widget buildCellWidget(String cellValue, String cellTip, bool hasFocus) {
       Color textColor = Colors.white;
+      Color focusBorderColor = Colors.yellow.shade700;
+      Color defaultBorderColor = Colors.white;
 
       String cellImage = 'empty';
       if (cellTip != '') {
@@ -23,6 +25,17 @@ class Board {
         fit: BoxFit.fill,
       );
 
+      Widget cellBackground = Container(
+        decoration: BoxDecoration(
+          border: Border.all(
+            width: 4.0,
+            color: hasFocus ? focusBorderColor : defaultBorderColor,
+            style: BorderStyle.solid,
+          ),
+        ),
+        child: imageWidget,
+      );
+
       Text textWidget = Text(
         cellValue,
         style: TextStyle(
@@ -36,7 +49,7 @@ class Board {
       return Stack(
         alignment: Alignment.center,
         children: <Widget>[
-          imageWidget,
+          cellBackground,
           Center(child: textWidget),
         ],
       );
@@ -67,7 +80,11 @@ class Board {
           cellTip = tips[colIndex];
         }
 
-        tableCells.add(TableCell(child: buildCellWidget(cellValue, cellTip)));
+        bool hasFocus = (!myProvider.gameWon) &&
+            (lineIndex == guesses.length) &&
+            (colIndex == word.length);
+
+        tableCells.add(TableCell(child: buildCellWidget(cellValue, cellTip, hasFocus)));
       }
 
       tableRows.add(TableRow(children: tableCells));
@@ -87,9 +104,8 @@ class Board {
       child: Table(
         defaultVerticalAlignment: TableCellVerticalAlignment.middle,
         border: TableBorder.all(
-          width: 2.0,
           color: Colors.white,
-          style: BorderStyle.solid,
+          style: BorderStyle.none,
         ),
         children: tableRows,
       ),