diff --git a/game/models.py b/game/models.py
index 7529f71..d3754bc 100644
--- a/game/models.py
+++ b/game/models.py
@@ -38,7 +38,7 @@ class Game(models.Model):
     )
 
     board = JSONField(
-        "Generated board", default=empty_list, help_text="Whe generated board game"
+        "Generated board", default=empty_list, help_text="The generated board game"
     )
     win = models.BooleanField(
         "Win?",
diff --git a/game/signals.py b/game/signals.py
index 1c4d972..f999f41 100644
--- a/game/signals.py
+++ b/game/signals.py
@@ -13,33 +13,6 @@ def game_start(sender, signal, instance, **kwargs):
     GameEvent.objects.get_or_create(game=instance, type=EventTypes.START_GAME)
 
 
-@receiver(pre_save, sender=GameEvent)
-def mark_game_as_playing(sender, signal, instance, **kwargs):
-    """ When event match, mark the game instance as playing """
-
-    playing_events = [
-        EventTypes.START_GAME,
-        EventTypes.RESUME,
-        EventTypes.CLICK_MINE,
-        EventTypes.CLICK_POINT,
-        EventTypes.CLICK_EMPTY,
-        EventTypes.CLICK_FLAG,
-    ]
-
-    if instance.type in playing_events:
-        instance.game.status = GameStatuses.PLAYING
-        instance.game.save()
-
-    elif instance.type == EventTypes.PAUSE:
-        instance.game.status = GameStatuses.PAUSED
-        instance.game.save()
-
-    if instance.type == EventTypes.CLICK_MINE:
-        instance.game.status = GameStatuses.FINISHED
-        instance.game.win = False
-        instance.game.save()
-
-
 @receiver(pre_save, sender=GameEvent)
 def identify_click_event(sender, signal, instance, **kwargs):
     """ Verify what is on the naive click: mine, point or empty """
@@ -64,3 +37,29 @@ def identify_click_event(sender, signal, instance, **kwargs):
 
     elif ms.is_point(instance.row, instance.col):
         instance.type = EventTypes.CLICK_POINT
+
+
+@receiver(post_save, sender=GameEvent)
+def create_post_save_game_event(sender, signal, instance, **kwargs):
+    playing_events = [
+        EventTypes.START_GAME,
+        EventTypes.RESUME,
+        EventTypes.CLICK_POINT,
+        EventTypes.CLICK_EMPTY,
+        EventTypes.CLICK_FLAG,
+    ]
+
+    if instance.type in playing_events:
+        instance.game.status = GameStatuses.PLAYING
+        instance.game.save()
+
+    if instance.type == EventTypes.PAUSE:
+        instance.game.status = GameStatuses.PAUSED
+        instance.game.save()
+
+    if instance.type == EventTypes.CLICK_MINE:
+        instance.game.status = GameStatuses.FINISHED
+        instance.game.win = False
+        instance.game.save()
+
+        GameEvent(game=instance.game, type=EventTypes.GAME_OVER).save()