diff --git a/gdm-switch-user-tty7.patch b/gdm-switch-user-tty7.patch
new file mode 100644
index 0000000..9063a89
--- /dev/null
+++ b/gdm-switch-user-tty7.patch
@@ -0,0 +1,26 @@
+From 89aa8f63555dd2e4a6b9fcdc49553e9feb231768 Mon Sep 17 00:00:00 2001
+From: Xiaoguang Wang <xwang@suse.com>
+Date: Tue, 5 Nov 2019 15:03:05 +0800
+Subject: [PATCH] session-worker: Select GDM_INITIAL_VT tty for greeter session
+
+Closes #532
+---
+ daemon/gdm-session-worker.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
+index 1319907e..0ca3dd0c 100644
+--- a/daemon/gdm-session-worker.c
++++ b/daemon/gdm-session-worker.c
+@@ -2201,7 +2201,7 @@ set_up_for_new_vt (GdmSessionWorker *worker)
+                 return FALSE;
+         }
+ 
+-        if (worker->priv->display_is_initial) {
++        if (strcmp (worker->priv->service, "gdm-launch-environment") == 0) {
+                 session_vt = GDM_INITIAL_VT;
+         } else {
+                 if (ioctl(fd, VT_OPENQRY, &session_vt) < 0) {
+-- 
+2.16.4
+
diff --git a/gdm.changes b/gdm.changes
index 33c08e8..a8578b6 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov  8 01:36:08 UTC 2019 - Xiaoguang Wang <xwang@suse.com>
+
+- Add gdm-switch-user-tty7.patch: Switch to tty7 when switch user
+  (bsc#1155408 glgo#GNOME#gdm#532).
+
 -------------------------------------------------------------------
 Tue Oct  8 11:37:53 UTC 2019 - Felix Zhang <fezhang@suse.com>
 
diff --git a/gdm.spec b/gdm.spec
index 9964da2..fd0fb4d 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -61,6 +61,8 @@ Patch8:         gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch
 Patch9:         gdm-initial-setup-hardening.patch
 # PATCH-FIX-OPENSUSE gdm-s390-not-require-g-s-d_wacom.patch bsc#1129412 yfjiang@suse.com -- Remove the runtime requirement of g-s-d Wacom plugin
 Patch13:        gdm-s390-not-require-g-s-d_wacom.patch
+# PATCH-FIX-UPSTREAM gdm-switch-user-tty7.patch bsc#1155408 glgo#GNOME#gdm#532 xwang@suse.com -- Switch to tty7 when switch user
+Patch14:        gdm-switch-user-tty7.patch
 ### NOTE: Keep please SLE-only patches at bottom (starting on 1000).
 # PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login.
 Patch1000:      gdm-disable-gnome-initial-setup.patch
@@ -216,6 +218,7 @@ cp %{SOURCE8} .
 %ifarch s390 s390x
 %patch13 -p1
 %endif
+%patch14 -p1
 
 # SLE-only patches start at 1000
 %if !0%{?is_opensuse}