diff --git a/helpers/DATA/mate-session-manager/mate-wm b/helpers/DATA/mate-session-manager/mate-wm
index 7f8c5cb5160fbcb785c4d59b50555a68868c1d01..4cb021121fa62bc731cdd9b0d1a4264b7767ba55 100755
--- a/helpers/DATA/mate-session-manager/mate-wm
+++ b/helpers/DATA/mate-session-manager/mate-wm
@@ -3,12 +3,14 @@
 WINDOW_MANAGER=xterm
 [ -f /usr/bin/marco ] && WINDOW_MANAGER=marco
 [ -f /usr/bin/marco-no-composite ] && WINDOW_MANAGER=marco-no-composite
+gsettings set org.mate.Marco.general compositing-manager false
 
 # Check for hardware acceleration
 if glxinfo -B | grep "OpenGL renderer string" | grep -qv llvmpipe ; then
   WINDOW_MANAGER=marco
+  gsettings set org.mate.Marco.general compositing-manager true
   # Use marco-glx (picom) on non-intel gpu, if available
-  if glxinfo -B | grep -qiv vendor.*intel; then
+  if ! glxinfo -B | grep -qi vendor.*intel; then
     if [ -f /usr/bin/picom ] && [ -f /usr/bin/marco-glx ] ; then
       WINDOW_MANAGER=marco-glx
     fi
diff --git a/helpers/make-mate-session-manager b/helpers/make-mate-session-manager
index 8e474a85225a9364356d56f02cec9da35432fd02..4a6291755c8b8b86154a859f25a37d33493c671c 100644
--- a/helpers/make-mate-session-manager
+++ b/helpers/make-mate-session-manager
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=7
+VERSION=8
 
 . ./config