diff --git a/dotfiles/.config/sway/bin/refresh_autostart.sh b/dotfiles/.config/sway/bin/refresh_autostart.sh
index 61d78c1..45470b5 100755
--- a/dotfiles/.config/sway/bin/refresh_autostart.sh
+++ b/dotfiles/.config/sway/bin/refresh_autostart.sh
@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
-grep -s "Exec=" /etc/xdg/autostart/* ${HOME}/.config/autostart/* | awk -F '=' '{print "exec",$2}'| sort -u > ~/.config/sway/config.d/autostart
+BLACKLIST="gnome-keyring-daemon"
+grep -s "Exec=" /etc/xdg/autostart/* ${HOME}/.config/autostart/* | awk -F '=' '{print "exec",$2}'| sort -u | egrep -v ${BLACKLIST} > ~/.config/sway/config.d/autostart
diff --git a/dotfiles/.config/sway/config b/dotfiles/.config/sway/config
index 819e384..be8c93f 100644
--- a/dotfiles/.config/sway/config
+++ b/dotfiles/.config/sway/config
@@ -263,8 +263,8 @@ mode $power_mode {
 }
 
 # Manual autostart
-exec stterm
-for_window [class="stterm"] move to workspace 1
+exec foot
+for_window [class="foot"] move to workspace 1
 exec firefox-esr
 for_window [class="Firefox"] move to workspace 2
 exec foot --title Spotify ncspot
@@ -272,6 +272,8 @@ for_window [title="Spotify"] move to workspace 3
 exec mount ~/nextcloud/
 exec keepassxc
 for_window [class="KeePassXC"] move to workspace 4
+exec geary
+for_window [title="Geary"] move to workspace 5
 
 # Autostart stuff here
 exec ~/.config/sway/bin/refresh_autostart.sh