diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp
index 08489cfbce..ca9235facf 100644
--- a/Telegram/SourceFiles/messenger.cpp
+++ b/Telegram/SourceFiles/messenger.cpp
@@ -129,7 +129,6 @@ Messenger::Messenger() : QObject()
 	QMimeDatabase().mimeTypeForName(qsl("text/plain"));
 
 	_window = std::make_unique<MainWindow>();
-	_window->createWinId();
 	_window->init();
 
 	auto currentGeometry = _window->geometry();
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index b433bcb641..83321ec4f8 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -216,6 +216,8 @@ MainWindow::Private::~Private() {
 
 MainWindow::MainWindow()
 : _private(std::make_unique<Private>(this)) {
+	auto forceOpenGL = std::make_unique<QOpenGLWidget>(this);
+
 	trayImg = st::macTrayIcon.instance(QColor(0, 0, 0, 180), dbisOne);
 	trayImgSel = st::macTrayIcon.instance(QColor(255, 255, 255), dbisOne);
 
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 54a805fc95..1363865b59 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -135,6 +135,9 @@ void MainWindow::updateWindowIcon() {
 }
 
 void MainWindow::init() {
+	Expects(!windowHandle());
+	createWinId();
+
 	initHook();
 	updateWindowIcon();