diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index b7f619c24..793799e7c 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -1060,10 +1060,10 @@ QPoint Application::getPointForCallPanelCenter() const {
 // macOS Qt bug workaround, sometimes no leaveEvent() gets to the nested widgets.
 void Application::registerLeaveSubscription(QWidget *widget) {
 #ifdef Q_OS_MAC
-	if (auto topLevel = widget->window()) {
-		if (topLevel == _window.get()) {
+	if (const auto topLevel = widget->window()) {
+		if (topLevel == _window->widget()) {
 			auto weak = make_weak(widget);
-			auto subscription = _window->leaveEvents(
+			auto subscription = _window->widget()->leaveEvents(
 			) | rpl::start_with_next([weak] {
 				if (const auto window = weak.data()) {
 					QEvent ev(QEvent::Leave);
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index 98160f4f4..0d8bcbbc2 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -39,6 +39,8 @@ public:
 
 	void updateWindowIcon() override;
 
+	class Private;
+
 public slots:
 	void psShowTrayMenu();
 
@@ -82,7 +84,6 @@ protected:
 	void closeWithoutDestroy() override;
 
 private:
-	class Private;
 	friend class Private;
 
 	void initTouchBar();
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 6d9096b9c..f90d48c4f 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -643,7 +643,7 @@ void MainWindow::createGlobalMenu() {
 	psContacts = window->addAction(lang(lng_mac_menu_contacts));
 	connect(psContacts, &QAction::triggered, psContacts, crl::guard(this, [=] {
 		if (isHidden()) {
-			showFromTray();
+			App::wnd()->showFromTray();
 		}
 		if (!account().sessionExists()) {
 			return;
@@ -652,7 +652,7 @@ void MainWindow::createGlobalMenu() {
 			box->addButton(langFactory(lng_close), [box] { box->closeBox(); });
 			box->addLeftButton(langFactory(lng_profile_add_contact), [] { App::wnd()->onShowAddContact(); });
 		}));
-	});
+	}));
 	psAddContact = window->addAction(lang(lng_mac_menu_add_contact), App::wnd(), SLOT(onShowAddContact()));
 	window->addSeparator();
 	psNewGroup = window->addAction(lang(lng_mac_menu_new_group), App::wnd(), SLOT(onShowNewGroup()));