diff --git a/SOURCES/0001-Accept-all-keyboard-layouts-by-default-to-prevent-co.patch b/SOURCES/0001-Accept-all-keyboard-layouts-by-default-to-prevent-co.patch
new file mode 100644
index 0000000..2253fc5
--- /dev/null
+++ b/SOURCES/0001-Accept-all-keyboard-layouts-by-default-to-prevent-co.patch
@@ -0,0 +1,62 @@
+From 6218cb1b5ece791451a6e9d4a367f12275fe7825 Mon Sep 17 00:00:00 2001
+From: ilmaisin <iiro.laiho@iki.fi>
+Date: Fri, 1 Feb 2019 15:32:52 +0000
+Subject: [PATCH] Accept all keyboard layouts by default to prevent confusing
+ behaviour
+
+---
+ data/dconf/defaults/00-upstream-settings | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/data/dconf/defaults/00-upstream-settings b/data/dconf/defaults/00-upstream-settings
+index f109e0a95..f47714741 100644
+--- a/data/dconf/defaults/00-upstream-settings
++++ b/data/dconf/defaults/00-upstream-settings
+@@ -1,41 +1,44 @@
+ # This file is part of the GDM packaging and should not be changed.
+ #
+ # Instead create your own file next to it with a higher numbered prefix,
+ # and run
+ #
+ #       dconf update
+ #
+ 
+ [org/gnome/desktop/session]
+ session-name='gnome'
+ 
++[org/gnome/desktop/input-sources]
++show-all-sources=true
++
+ [org/gnome/desktop/a11y]
+ always-show-universal-access-status=true
+ 
+ [org/gnome/desktop/background]
+ show-desktop-icons=false
+ 
+ [org/gnome/desktop/default-applications/terminal]
+ exec='true'
+ 
+ [org/gnome/desktop/lockdown]
+ disable-application-handlers=true
+ disable-command-line=true
+ disable-lock-screen=true
+ disable-log-out=false
+ disable-printing=true
+ disable-print-setup=true
+ disable-save-to-disk=true
+ disable-user-switching=true
+ 
+ [org/gnome/desktop/sound]
+ event-sounds=true
+ 
+ [org/gnome/settings-daemon/plugins/media-keys]
+ calculator=''
+ eject=''
+ email=''
+ help=''
+ home=''
+ media=''
+ next=''
+-- 
+2.25.1
+
diff --git a/SPECS/gdm.spec b/SPECS/gdm.spec
index 53655bb..6824616 100644
--- a/SPECS/gdm.spec
+++ b/SPECS/gdm.spec
@@ -10,7 +10,7 @@
 Name: gdm
 Epoch: 1
 Version: 3.28.2
-Release: 22%{?dist}
+Release: 23%{?dist}
 Summary: The GNOME Display Manager
 
 License: GPLv2+
@@ -55,6 +55,8 @@ Patch110005: 0005-display-factory-avoid-removing-a-display-from-store-.patch
 Patch110006: 0006-manager-ensure-factories-are-stopped-at-shutdown.patch
 Patch110007: 0007-daemon-run-PostSession-script-from-mnager-not-worker.patch
 
+Patch120001: 0001-Accept-all-keyboard-layouts-by-default-to-prevent-co.patch
+
 Patch900000: audit-4.patch
 Patch900001: clear-screen.patch
 Patch900002: 0001-gdm.conf-custom.in-strip-out-reference-to-wayland.patch
@@ -382,6 +384,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/gdm-pam-extensions.pc
 
 %changelog
+* Wed May 06 2020 Ray Strode <rstrode@redhat.com> - 3.28.2-23
+- Support exotic keyboard layouts better
+  Related: #1734143
+
 * Tue Oct 29 2019 Ray Strode <rstrode@redhat.com> - 3.28.2-22
 - Fix PostSession on reboot too
 - Fix spew in log on shutdown