diff --git a/plugins/git-features-trainer/src/training/git/lesson/GitCommitLesson.kt b/plugins/git-features-trainer/src/training/git/lesson/GitCommitLesson.kt
index 0b27ada52c0e..d31c6f74f755 100644
--- a/plugins/git-features-trainer/src/training/git/lesson/GitCommitLesson.kt
+++ b/plugins/git-features-trainer/src/training/git/lesson/GitCommitLesson.kt
@@ -23,6 +23,7 @@ import com.intellij.util.PlatformUtils
 import com.intellij.util.ui.UIUtil
 import com.intellij.vcs.commit.AbstractCommitWorkflowHandler
 import com.intellij.vcs.commit.CommitActionsPanel
+import com.intellij.vcs.commit.CommitNotification
 import com.intellij.vcs.commit.restoreState
 import com.intellij.vcs.log.ui.frame.VcsLogChangesBrowser
 import com.intellij.vcs.log.ui.table.VcsLogGraphTable
@@ -180,7 +181,7 @@ class GitCommitLesson : GitLesson("Git.Commit", GitLessonsBundle.message("git.co
       triggerAndBorderHighlight().component { ui: JBOptionButton ->
         ui.text?.contains(commitButtonText) == true
       }
-      triggerOnNotification { it.displayId == VcsNotificationIdsHolder.COMMIT_FINISHED }
+      triggerOnNotification { it is CommitNotification }
       showWarningIfCommitWindowClosed()
       test {
         ideFrame {
@@ -282,7 +283,7 @@ class GitCommitLesson : GitLesson("Git.Commit", GitLessonsBundle.message("git.co
       text(GitLessonsBundle.message("git.commit.amend.commit", strong(amendButtonText)))
       text(GitLessonsBundle.message("git.commit.amend.commit.balloon"),
            LearningBalloonConfig(Balloon.Position.above, width = 0))
-      triggerOnNotification { it.displayId == VcsNotificationIdsHolder.COMMIT_FINISHED }
+      triggerOnNotification { it is CommitNotification }
       showWarningIfCommitWindowClosed()
       test {
         ideFrame {