diff --git a/init b/init
index 6c161ce..c86e50b 100755
--- a/init
+++ b/init
@@ -240,6 +240,9 @@ riverctl keyboard-layout \
 # Set the default layout generator to be rivertile (started by systemd)
 riverctl default-layout rivertile
 
+# Use xwayland-satellite by default
+export DISPLAY=:1
+
 # Update the some environment variables
 systemctl --user import-environment WAYLAND_DISPLAY DISPLAY
 dbus-update-activation-environment WAYLAND_DISPLAY DISPLAY
@@ -247,7 +250,7 @@ dbus-update-activation-environment WAYLAND_DISPLAY DISPLAY
 # Notify systemd that we have setup River
 systemd-notify --ready
 
-"${SCRIPT_DIR}/emacs-server-import-environment.el" WAYLAND_DISPLAY
+"${SCRIPT_DIR}/emacs-server-import-environment.el" WAYLAND_DISPLAY DISPLAY
 
 # The following is a list of units to enable:
 # systemctl --user enable waybar.service
@@ -261,6 +264,7 @@ systemd-notify --ready
 # systemctl --user enable khal-notify.service
 # systemctl --user enable inhibit-sleep-for-audio.service
 # systemctl --user enable rivertile.service
+# systemctl --user enable xwayland-satellite.service
 
 # Laptop only:
 # systemctl --user enable laptop-lid-daemon.service
diff --git a/systemd/xwayland-satellite.service b/systemd/xwayland-satellite.service
new file mode 100644
index 0000000..07ee5ce
--- /dev/null
+++ b/systemd/xwayland-satellite.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Xwayland outside your Wayland
+BindsTo=graphical-session.target
+PartOf=graphical-session.target
+After=graphical-session.target
+Requisite=graphical-session.target
+
+[Service]
+Type=notify
+NotifyAccess=all
+ExecStart=/usr/bin/xwayland-satellite :1
+StandardOutput=journal
+
+[Install]
+WantedBy=graphical-session.target