diff --git a/files/settings/i3.config b/files/settings/i3.config
index ff972f1..82d90e1 100644
--- a/files/settings/i3.config
+++ b/files/settings/i3.config
@@ -362,10 +362,10 @@ exec --no-startup-id light -O
 exec --no-startup-id light -N 0
 
 # Set the correct keymap.
-exec --no-startup-id setxkbmap -layout us -variant altgr-intl
+exec_always --no-startup-id setxkbmap -layout us -variant altgr-intl
 
 # Notifications (allows fyi and notify-send to work)
-exec --no-startup-id dunst
+exec_always --no-startup-id "killall dunst; dunst"
 
 # Audio
 exec --no-startup-id "sleep 00; dbus-launch --exit-with-session i3"