diff --git a/.config/setup/04-install-sway-session.sh b/.config/setup/04-install-sway-session.sh
new file mode 100755
index 0000000..e1f16a8
--- /dev/null
+++ b/.config/setup/04-install-sway-session.sh
@@ -0,0 +1,3 @@
+#! /usr/bin/sh
+
+sudo cp "$(systemd-path user-configuration)"/setup/sway.desktop /usr/share/wayland-sessions/
diff --git a/.config/setup/sway.desktop b/.config/setup/sway.desktop
new file mode 100644
index 0000000..175249e
--- /dev/null
+++ b/.config/setup/sway.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=0.1
+Name=Sway
+Comment=An i3-compatible Wayland compositor
+Exec=/home/ohad/.local/bin/run-sway
+Type=Application
+DesktopNames=sway
diff --git a/.local/bin/run-sway b/.local/bin/run-sway
new file mode 100755
index 0000000..c7f043d
--- /dev/null
+++ b/.local/bin/run-sway
@@ -0,0 +1,7 @@
+#! /usr/bin/bash
+
+set -euo pipefail
+IFS=$'\n\t'
+
+source "$(systemd-path user)"/.profile
+exec /usr/bin/sway
diff --git a/.profile b/.profile
index 9b2a274..633f877 100644
--- a/.profile
+++ b/.profile
@@ -37,7 +37,7 @@ fi
 
 umask 0007
 
-for filename in "$(systemd-path user-configuration)"/environment/*; do
+for filename in $(systemd-path user-configuration)/environment/*; do
     . "$filename"
 done