diff --git a/plasma-kwin_wayland.service.in b/plasma-kwin_wayland.service.in
index 90f539a82..678810cf5 100644
--- a/plasma-kwin_wayland.service.in
+++ b/plasma-kwin_wayland.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=KDE Window Manager
+PartOf=graphical-session.target
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kwin_wayland
diff --git a/plasma-kwin_x11.service.in b/plasma-kwin_x11.service.in
index 2297fd5f1..8638f652d 100644
--- a/plasma-kwin_x11.service.in
+++ b/plasma-kwin_x11.service.in
@@ -1,8 +1,10 @@
 [Unit]
 Description=KDE Window Manager
 Wants=plasma-kcminit.service
+PartOf=graphical-session.target
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kwin_x11 --replace
 BusName=org.kde.KWin
 Slice=session.slice
+Restart=on-failure