diff --git a/U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch b/U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch
new file mode 100644
index 0000000..f7fc8cd
--- /dev/null
+++ b/U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch
@@ -0,0 +1,32 @@
+From 9f83180219380c690fb743182308bc2d534b8b1b Mon Sep 17 00:00:00 2001
+From: Dominique Martinet <asmadeus@codewreck.org>
+Date: Sun, 8 Jul 2018 02:15:43 +0900
+Subject: [PATCH] viewer: reset ctrl / alt to menu state on focus
+
+Setting Ctrl or Alt key on menu only sends the key press, and the
+state is lost when focus is lost and recovered.
+This checks the menu variable and sends the keys again if needed.
+---
+ vncviewer/Viewport.cxx | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
+index 4e23dc8c..317f06b2 100644
+--- a/vncviewer/Viewport.cxx
++++ b/vncviewer/Viewport.cxx
+@@ -635,6 +635,12 @@ int Viewport::handle(int event)
+       exit_vncviewer(e.str());
+     }
+ 
++    // Resend Ctrl/Alt if needed
++    if (menuCtrlKey)
++      handleKeyPress(0x1d, XK_Control_L);
++    if (menuAltKey)
++      handleKeyPress(0x38, XK_Alt_L);
++
+     // Yes, we would like some focus please!
+     return 1;
+ 
+-- 
+2.16.4
+
diff --git a/tigervnc.changes b/tigervnc.changes
index 7b450f7..1cb4d0f 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan  8 12:38:42 UTC 2019 - msrb@suse.com
+
+- Add U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch
+  * Fix the ALT and CTRL buttons in viewer's F8 menu. (bsc#1119354)
+
 -------------------------------------------------------------------
 Wed Sep 19 21:19:21 UTC 2018 - Jason Sikes <jsikes@suse.de>
 
diff --git a/tigervnc.spec b/tigervnc.spec
index 02b10b0..45c7bfe 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tigervnc
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -138,6 +138,7 @@ Patch7:         u_build_libXvnc_as_separate_library.patch
 Patch8:         u_tigervnc-add-autoaccept-parameter.patch
 Patch9:         u_change-button-layout-in-ServerDialog.patch
 Patch10:        n_correct_path_in_desktop_file.patch
+Patch11:        U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch
 
 %description
 TigerVNC is an implementation of VNC (Virtual Network Computing), a
@@ -251,6 +252,7 @@ cp -r /usr/src/xserver/* unix/xserver/
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 pushd unix/xserver
 patch -p1 < ../xserver120.patch