diff --git a/helpers/DATA/mate-session-manager/mate-wm b/helpers/DATA/mate-session-manager/mate-wm
index b2d1c00f52ec22a2dc0f476d70b5fb5875513b5e..e2853a521e2f7605ba34f12560f525866e97be5e 100755
--- a/helpers/DATA/mate-session-manager/mate-wm
+++ b/helpers/DATA/mate-session-manager/mate-wm
@@ -74,7 +74,13 @@ fi
 # Avoid looping if the session configuration tells us to use mate-wm or if
 # the user forces mate-wm via WINDOW_MANAGER
 if [ "x$WINDOW_MANAGER" = "xmate-wm" ]; then
-  WINDOW_MANAGER=""
+  if [ $IS_X_COMPOSITED = 0 ]; then
+    WINDOW_MANAGER="marco-compton"
+    gsettings set org.mate.session.required-components windowmanager marco-compton
+  else
+    WINDOW_MANAGER="marco-no-composite"
+    gsettings set org.mate.session.required-components windowmanager marco-no-composite
+  fi
 fi
 
 if [ -z "$WINDOW_MANAGER" ] ; then
diff --git a/helpers/make-mate-session-manager b/helpers/make-mate-session-manager
index e8df10b3d9b7c6b3cd5bc00c24e5136fb7a9d425..323404b0c20cf1c38e284d9aea09b6bddc76d8f0 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=3
+VERSION=4
 
 . ./config