diff --git a/sway/autostart b/sway/autostart
index 8b3357186..e06d503ee 100644
--- a/sway/autostart
+++ b/sway/autostart
@@ -36,10 +36,10 @@ exec pasystray &
 # 1:chat
 # TODO: Set up ZNC then use a client that can actually generate notifications
 exec xterm -e /bin/bash -c "ssh -i ~/.ssh/no_pass jpm@john.me.tz -t 'screen -x irssi'" &
-exec flatpak run com.mattermost.Desktop
+exec flatpak run com.mattermost.Desktop &
 
 # 2:mail - Should also prompt for keyring
-exec thunderbird &
+exec flatpak run org.mozilla.Thunderbird &
 
 # 3:chrm
 # Don't launch chromium because it hogs resources
@@ -50,4 +50,4 @@ exec thunderbird &
 #exec linphone &
 
 # 7:FF Dev edition
-exec $HOME/.local/bin/firefox/firefox-bin &
+exec flatpak run org.mozilla.firefox &
diff --git a/sway/config b/sway/config
index 1eff4aa5b..059c2e7b6 100755
--- a/sway/config
+++ b/sway/config
@@ -109,4 +109,10 @@ focus_on_window_activation urgent
 # Start-up Applications
 ################################################################################
 
+# Configure XDG desktop portal
+exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
+exec dbus-update-activation-environment 2>/dev/null && \
+     dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
+exec systemctl --user start xdg-desktop-portal-wlr.service
+
 include $HOME/.dotfiles/sway/autostart