diff --git a/gajim/common/dbus_support.py b/gajim/common/dbus_support.py
index b8d4d26b2..dc4c4e06d 100644
--- a/gajim/common/dbus_support.py
+++ b/gajim/common/dbus_support.py
@@ -36,7 +36,7 @@ try:
     DBusGMainLoop(set_as_default=True)
 except ImportError:
     supported = False
-    if sys.platform == 'linux':  # windows and mac have no dbus
+    if sys.platform not in ('win32', 'darwin'):
         print(_('D-Bus python bindings are missing in this computer'))
         print(_('D-Bus capabilities of Gajim cannot be used'))
 else:
@@ -47,7 +47,7 @@ else:
         supported = True # does user have D-Bus bindings?
     except dbus.DBusException:
         supported = False
-        if sys.platform == 'linux':  # windows and mac have no dbus
+        if sys.platform not in ('win32', 'darwin'):
             print(_('D-Bus does not run correctly on this machine'))
             print(_('D-Bus capabilities of Gajim cannot be used'))
     except exceptions.SystemBusNotPresent:
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 4ba329946..07527541c 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -1111,7 +1111,7 @@ class Interface:
         if connected == invisible_show:
             return
         # send currently played music
-        if (pep_supported and sys.platform == 'linux' and
+        if (pep_supported and sys.platform not in ('win32', 'darwin') and
                 app.config.get_per('accounts', account, 'publish_tune')):
             self.enable_music_listener()
         # enable location listener
@@ -2723,7 +2723,7 @@ class Interface:
         self.remote_ctrl = None
 
         # Handle screensaver
-        if sys.platform == 'linux':
+        if sys.platform not in ('win32', 'darwin'):
             logind.enable()
             screensaver.enable()
 
diff --git a/gajim/notify.py b/gajim/notify.py
index 8d575b7e7..dc3c742d7 100644
--- a/gajim/notify.py
+++ b/gajim/notify.py
@@ -78,7 +78,7 @@ class Notification:
         self.daemon_capabilities = ['actions']
 
         # Detect if actions are supported by the notification daemon
-        if sys.platform == 'linux':
+        if sys.platform not in ('win32', 'darwin'):
             def on_proxy_ready(source, res, data=None):
                 try:
                     proxy = Gio.DBusProxy.new_finish(res)
diff --git a/gajim/roster_window.py b/gajim/roster_window.py
index 0b7c309bb..8746d2f48 100644
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -4966,7 +4966,7 @@ class RosterWindow:
 
                 item = Gtk.CheckMenuItem(_('Publish Tune'))
                 pep_submenu.append(item)
-                if sys.platform != 'linux':
+                if sys.platform in ('win32', 'darwin'):
                     item.set_sensitive(False)
                 else:
                     activ = app.config.get_per('accounts', account,