diff --git a/Stepic/AmplitudeAnalyticsEvents.swift b/Stepic/AmplitudeAnalyticsEvents.swift
index 2c2d901d68..79fe0e9cdb 100644
--- a/Stepic/AmplitudeAnalyticsEvents.swift
+++ b/Stepic/AmplitudeAnalyticsEvents.swift
@@ -302,7 +302,7 @@ struct AmplitudeAnalyticsEvents {
 
         static func buttonPressed(id: Int, position: Int) -> AnalyticsEvent {
             return AnalyticsEvent(
-                name: "Button pressed",
+                name: "Story button pressed",
                 parameters: [
                     "id": id,
                     "position": position
diff --git a/Stepic/Modules/ContinueCourse/ContinueCourseViewController.swift b/Stepic/Modules/ContinueCourse/ContinueCourseViewController.swift
index 08e25f106f..81896f0536 100644
--- a/Stepic/Modules/ContinueCourse/ContinueCourseViewController.swift
+++ b/Stepic/Modules/ContinueCourse/ContinueCourseViewController.swift
@@ -82,6 +82,8 @@ extension ContinueCourseViewController: ContinueCourseViewControllerProtocol {
         if viewModel.shouldShowTooltip {
             // Cause anchor should be in true position
             DispatchQueue.main.async { [weak self] in
+                self?.continueCourseView?.setNeedsLayout()
+                self?.continueCourseView?.layoutIfNeeded()
                 self?.continueLearningTooltip.show(
                     direction: .up,
                     in: continueCourseView,