diff --git a/dotfiles/desktop/.config/hypr/hyprland.conf b/dotfiles/desktop/.config/hypr/hyprland.conf
index 9cce7d1..dd647c3 100644
--- a/dotfiles/desktop/.config/hypr/hyprland.conf
+++ b/dotfiles/desktop/.config/hypr/hyprland.conf
@@ -90,6 +90,7 @@ windowrule = idle_inhibit focus, match:content 2
 
 # Autostart — XDG and session services
 exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP
+exec-once = env UPDATE_TURNSTILE_RESTART_EMACS=1 ~/.local/bin/update-turnstile-env
 exec-once = dex --autostart --environment Hyprland
 exec-once = gnome-keyring-daemon --start --components=secrets
 exec-once = ~/.local/bin/setup-gtk-theme
diff --git a/dotfiles/desktop/.config/sway/config b/dotfiles/desktop/.config/sway/config
index a00f6c6..7229d42 100644
--- a/dotfiles/desktop/.config/sway/config
+++ b/dotfiles/desktop/.config/sway/config
@@ -110,6 +110,7 @@ for_window [app_id="org.freedesktop.impl.portal.desktop.gtk"] floating enable
 # Propagate Wayland env to dbus so xdg-desktop-portal backends inherit
 # WAYLAND_DISPLAY/SWAYSOCK when dbus-activated (otherwise they crash).
 exec dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP
+exec env UPDATE_TURNSTILE_RESTART_EMACS=1 ~/.local/bin/update-turnstile-env
 exec dex --autostart --environment sway
 exec gnome-keyring-daemon --start --components=secrets
 exec_always ~/.config/sway/scripts/setup-gtk-theme.sh
diff --git a/dotfiles/desktop/.local/bin/update-turnstile-env b/dotfiles/desktop/.local/bin/update-turnstile-env
index 303efff..078538d 100755
--- a/dotfiles/desktop/.local/bin/update-turnstile-env
+++ b/dotfiles/desktop/.local/bin/update-turnstile-env
@@ -8,8 +8,13 @@ fi
 
 vars="DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS SSH_AUTH_SOCK XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE"
 
-[ -n "${WAYLAND_DISPLAY:-}" ] && vars="$vars WAYLAND_DISPLAY"
-[ -n "${SWAYSOCK:-}" ]        && vars="$vars SWAYSOCK"
+[ -n "${WAYLAND_DISPLAY:-}" ]             && vars="$vars WAYLAND_DISPLAY"
+[ -n "${SWAYSOCK:-}" ]                    && vars="$vars SWAYSOCK"
+[ -n "${HYPRLAND_INSTANCE_SIGNATURE:-}" ] && vars="$vars HYPRLAND_INSTANCE_SIGNATURE"
 
 # shellcheck disable=SC2086
 turnstile-update-runit-env $vars >/dev/null 2>&1 || true
+
+if [ "${UPDATE_TURNSTILE_RESTART_EMACS:-0}" = "1" ] && command -v sv >/dev/null 2>&1; then
+  sv restart "$HOME/.config/service/emacs" >/dev/null 2>&1 || true
+fi