diff --git a/.config/sway/config b/.config/sway/config
index 077d525..215b4ee 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -52,11 +52,13 @@ exec_always --no-startup-id '/home/work/.config/sway/scripts/clamshell-mode.sh'
 
 seat seat0 xcursor_theme Adwaita 35
 
+exec systemctl --user start xdg-desktop-portal-wlr.service
 #exec pipewire
 exec swaync
 exec shikane
 exec nm-applet
 exec blueman-applet
+exec hypridle
 
 exec systemctl --user start hyperolkitagent
 exec waybar -c ~/.config/sway/waybar/config.jsonc -s ~/.config/sway/waybar/style.css
@@ -64,7 +66,6 @@ exec flatpak run com.github.wwmm.easyeffects -w
 exec xrdb -merge ~/.Xresources
 exec wl-paste -t text --watch clipman store --no-persist
 
-exec hypridle
 #exec gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
 
 #exec mpd
@@ -91,7 +92,9 @@ bindsym $mod+Ctrl+y      exec : | wl-copy -p
 
 #default_border pixel 2
 #default_floating_border pixel 2
-#exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
-#exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway XDG_SESSION_DESKTOP=sway
-
+exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP WAYLAND_DISPLAY SWAYSOCK
+exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway XDG_SESSION_DESKTOP=sway
+# Activate graphical-session.target so xdg-desktop-portal (Requisite=graphical-session.target) can start
+exec systemctl --user start sway-session.target
+#exec --no-startup-id dbus-update-activation-environment --all
 
diff --git a/.config/sway/waybar/config.jsonc b/.config/sway/waybar/config.jsonc
index 2402b68..d9160df 100644
--- a/.config/sway/waybar/config.jsonc
+++ b/.config/sway/waybar/config.jsonc
@@ -2,9 +2,9 @@
 {
     "spacing": 2, // Gaps between modules (4px)
     "modules-left": [
-        "hyprland/workspaces",
-        "hyprland/submap",
-        "hyprland/window"
+        "sway/workspaces",
+        "sway/submap",
+        "sway/window"
     ],
     //"modules-center": [
         //"sway/window"