diff --git a/SOURCES/20-redhat-kiosk.conf b/SOURCES/20-redhat-kiosk.conf
new file mode 100644
index 0000000..acbd369
--- /dev/null
+++ b/SOURCES/20-redhat-kiosk.conf
@@ -0,0 +1,3 @@
+Section "ServerFlags"
+    Option "DontVTSwitch" "on"
+EndSection
diff --git a/SPECS/gnome-session.spec b/SPECS/gnome-session.spec
index 43e49f7..70ad176 100644
--- a/SPECS/gnome-session.spec
+++ b/SPECS/gnome-session.spec
@@ -9,7 +9,7 @@
 
 Name: gnome-session
 Version: 3.28.1
-Release: 10%{?dist}
+Release: 10%{?dist}.1
 Summary: GNOME session manager
 
 License: GPLv2+
@@ -22,6 +22,7 @@ Source4: com.redhat.Kiosk.Script.desktop
 Source5: com.redhat.Kiosk.desktop
 Source6: redhat-kiosk.session
 Source7: redhat-kiosk
+Source8: 20-redhat-kiosk.conf
 
 Patch0: 0001-gnome-session-don-t-validate-shell-before-using-it.patch
 
@@ -128,6 +129,7 @@ install -D $RPM_SOURCE_DIR/com.redhat.Kiosk.Script.desktop -t $RPM_BUILD_ROOT%{_
 install -D $RPM_SOURCE_DIR/com.redhat.Kiosk.desktop -t $RPM_BUILD_ROOT%{_datadir}/xsessions
 install -D $RPM_SOURCE_DIR/redhat-kiosk.session -t $RPM_BUILD_ROOT%{_datadir}/gnome-session/sessions
 install -D $RPM_SOURCE_DIR/redhat-kiosk -t $RPM_BUILD_ROOT%{_bindir}
+install -D $RPM_SOURCE_DIR/20-redhat-kiosk.conf -t $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
 
 %find_lang %{po_package}
 
@@ -135,6 +137,7 @@ install -D $RPM_SOURCE_DIR/redhat-kiosk -t $RPM_BUILD_ROOT%{_bindir}
 
 %files xsession
 %{_datadir}/xsessions/*
+%exclude %{_datadir}/xsessions/com.redhat.Kiosk.desktop
 
 %files wayland-session
 %{_datadir}/wayland-sessions/*
@@ -144,6 +147,7 @@ install -D $RPM_SOURCE_DIR/redhat-kiosk -t $RPM_BUILD_ROOT%{_bindir}
 %{_datadir}/applications/com.redhat.Kiosk.Script.desktop
 %{_datadir}/xsessions/com.redhat.Kiosk.desktop
 %{_datadir}/gnome-session/sessions/redhat-kiosk.session
+%{_datadir}/X11/xorg.conf.d/20-redhat-kiosk.conf
 %{_bindir}/redhat-kiosk
 
 %files -f %{po_package}.lang
@@ -162,6 +166,11 @@ install -D $RPM_SOURCE_DIR/redhat-kiosk -t $RPM_BUILD_ROOT%{_bindir}
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 
 %changelog
+* Fri Jun 04 2021 Ray Strode <rstrode@redhat.com> - 3.28.1-10.1
+- Exclude kiosk-session from xsession subpackage
+- Disable VT switching when kiosk-session is installed
+  Related: #1959505
+
 * Mon Jun 29 2020 Ray Strode <rstrode@redhat.com> - 3.28.1-10
 - Show cursor explicitly from session selector
   Resolves: #1624430