diff --git a/client/Application.cpp b/client/Application.cpp
index b0843b686..b458b86e5 100644
--- a/client/Application.cpp
+++ b/client/Application.cpp
@@ -920,8 +920,8 @@ void Application::showClient(const QStringList &params, bool crypto, bool sign,
 	// Required for restoring minimized window on macOS
 	w->setWindowState(Qt::WindowActive);
 #endif
-	w->activateWindow();
 	w->show();
+	w->activateWindow();
 	w->raise();
 	if( !params.isEmpty() )
 		QMetaObject::invokeMethod(w, "open", Q_ARG(QStringList,params), Q_ARG(bool,crypto), Q_ARG(bool,sign));
diff --git a/cmake b/cmake
index 01ec22ddc..cb0452839 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 01ec22ddceaf93824737bed3158bd4a560c4af9d
+Subproject commit cb04528398ad10dfea1802c98d4199b29fb6f616