diff --git a/init b/init
index 586b752..8c5a578 100755
--- a/init
+++ b/init
@@ -237,10 +237,8 @@ riverctl keyboard-layout \
          -options 'caps:ctrl_modifier' \
          'us'
 
-# Set the default layout generator to be rivertile and start it.
-# River will send the process group of the init executable SIGTERM on exit.
+# Set the default layout generator to be rivertile (started by systemd)
 riverctl default-layout rivertile
-rivertile -view-padding 3 -outer-padding 3 -main-ratio 0.5 &
 
 # Update the some environment variables
 systemctl --user import-environment WAYLAND_DISPLAY DISPLAY
@@ -262,6 +260,7 @@ systemd-notify --ready
 # systemctl --user enable swaybg.service
 # systemctl --user enable khal-notify.service
 # systemctl --user enable inhibit-sleep-for-audio.service
+# systemctl --user enable rivertile.service
 
 # Laptop only:
 # systemctl --user enable laptop-lid-daemon.service
diff --git a/systemd/rivertile.service b/systemd/rivertile.service
new file mode 100644
index 0000000..a9e342e
--- /dev/null
+++ b/systemd/rivertile.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Tiled layout generator for river
+Documentation=man:rivertile(1)
+After=river.service
+Requires=river.service
+
+[Service]
+Type=exec
+ExecStart=rivertile -view-padding 3 -outer-padding 3 -main-ratio 0.5
+Restart=on-failure
+
+[Install]
+WantedBy=river-session.target