diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py
index 3e81f7d..bfdbe62 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenu.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenu.py
@@ -54,8 +54,11 @@ ICON = "/usr/lib/linuxmint/mintMenu/visualisation-logo.png"
 
 sys.path.append( os.path.join( PATH , "plugins") )
 
-# FIXME: Get the windowmanager from somewhere, don't take GNOME for granted
-xdg.Config.setWindowManager( "GNOME" )
+# FIX: Get the window manager from the GDMSESSION environment variable, fallback to GNOME if it's not set
+windowManager = os.getenv("GDMSESSION").upper()
+if not windowManager:
+    windowManager = "GNOME"
+xdg.Config.setWindowManager( windowManager )
 
 from easybuttons import iconManager
 from easygconf import EasyGConf