diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 2a8a887a4..b19ff5d9d 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -40,6 +40,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtGui/QWindow>
 
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#include <giomm.h>
+#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+
 namespace Window {
 namespace Notifications {
 namespace {
@@ -85,7 +89,13 @@ base::options::toggle OptionGNotification({
 	.name = "GNotification",
 	.description = "Force enable GLib's GNotification."
 		" When disabled, autodetect is used.",
-	.scope = base::options::linux,
+	.scope = [] {
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+		return bool(Gio::Application::get_default());
+#else // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+		return false;
+#endif // DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+	},
 	.restartRequired = true,
 });
 
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 723df5d51..7f1291715 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 723df5d5109bd5c07f30e05f0b0a0520643ef41b
+Subproject commit 7f129171548a3828693d7f79fbdb783464f31b97