diff --git a/packaging/linux-common/nymea-app-kiosk.desktop b/packaging/linux-common/nymea-app-kiosk.desktop
index 23817b2b..70f2c28d 100644
--- a/packaging/linux-common/nymea-app-kiosk.desktop
+++ b/packaging/linux-common/nymea-app-kiosk.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=XSession
-Exec=/usr/bin/openbox --startup /usr/bin/nymea-app-kiosk-wrapper
+Exec=/usr/bin/nymea-app-session
 DesktopNames=nymea:app
 
diff --git a/packaging/linux-common/nymea-app-session b/packaging/linux-common/nymea-app-session
new file mode 100644
index 00000000..71a62088
--- /dev/null
+++ b/packaging/linux-common/nymea-app-session
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/bin/openbox --startup /usr/bin/nymea-app-kiosk-wrapper
diff --git a/packaging/ubuntu/debian/nymea-app-kiosk.install b/packaging/ubuntu/debian/nymea-app-kiosk.install
index 09445ca8..ec2e1b2f 100644
--- a/packaging/ubuntu/debian/nymea-app-kiosk.install
+++ b/packaging/ubuntu/debian/nymea-app-kiosk.install
@@ -1,4 +1,5 @@
 packaging/linux-common/nymea-app-kiosk.desktop /usr/share/xsessions/
 packaging/linux-common/lightdm/60-nymea-app-kiosk.conf /usr/share/lightdm/lightdm.conf.d/
 packaging/linux-common/nymea-app-kiosk-wrapper /usr/bin/
+packaging/linux-common/nymea-app-session /usr/bin/
 packaging/linux-common/udev/90-pi-backlight.rules /lib/udev/rules.d/