diff --git a/0001-Some-UI-fixes-for-logout-dialog.patch b/0001-Some-UI-fixes-for-logout-dialog.patch
new file mode 100644
index 0000000..7a4507e
--- /dev/null
+++ b/0001-Some-UI-fixes-for-logout-dialog.patch
@@ -0,0 +1,75 @@
+From 553535ea35c9e3a2b82fc46e76e0b72fbd2143a6 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Sun, 9 Apr 2017 13:34:21 +0200
+Subject: [PATCH] Some UI fixes for logout dialog
+
+Less intrusive parts of 5f2f343ef ('UI fixes for logout dialog'):
+* add an OK button, that was complained a lot
+* Stop timer with arrow keys
+* Hide timer label if timer not running
+---
+ lookandfeel/contents/logout/Logout.qml       | 22 +++++++++++++++++++---
+ lookandfeel/contents/logout/LogoutButton.qml |  1 +
+ 2 files changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml
+index 839c390f..e1573f5e 100644
+--- a/lookandfeel/contents/logout/Logout.qml
++++ b/lookandfeel/contents/logout/Logout.qml
+@@ -74,6 +74,7 @@ PlasmaCore.ColorScope {
+     }
+ 
+     Timer {
++        id: countDownTimer
+         running: true
+         repeat: true
+         interval: 1000
+@@ -155,6 +156,14 @@ PlasmaCore.ColorScope {
+ 
+         PlasmaComponents.Label {
+             Layout.alignment: Qt.AlignHCenter
++            //opacity, as visible would re-layout
++            opacity: countDownTimer.running ? 1 : 0
++            Behavior on opacity {
++                OpacityAnimator {
++                    duration: units.longDuration
++                    easing.type: Easing.InOutQuad
++                }
++            }
+             text: {
+                 switch (sdtype) {
+                     case ShutdownType.ShutdownTypeReboot:
+@@ -167,10 +176,17 @@ PlasmaCore.ColorScope {
+             }
+         }
+ 
+-        PlasmaComponents.Button {
++        RowLayout {
+             Layout.alignment: Qt.AlignHCenter
+-            text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Cancel")
+-            onClicked: root.cancelRequested()
++            PlasmaComponents.Button {
++                enabled: root.currentAction != null
++                text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "OK")
++                onClicked: root.currentAction()
++            }
++            PlasmaComponents.Button {
++                text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Cancel")
++                onClicked: root.cancelRequested()
++            }
+         }
+     }
+ }
+diff --git a/lookandfeel/contents/logout/LogoutButton.qml b/lookandfeel/contents/logout/LogoutButton.qml
+index 4c92657e..4de0b0d3 100644
+--- a/lookandfeel/contents/logout/LogoutButton.qml
++++ b/lookandfeel/contents/logout/LogoutButton.qml
+@@ -35,4 +35,5 @@ ActionButton {
+             easing.type: Easing.InOutQuad
+         }
+     }
++    Keys.onPressed: countDownTimer.running = false
+ }
+-- 
+2.12.0
+
diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes
index c30be2a..f276cde 100644
--- a/plasma5-workspace.changes
+++ b/plasma5-workspace.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 13 18:13:46 UTC 2017 - fabian@ritter-vogt.de
+
+- Add patch to fix some logout UI issues:
+  * 0001-Some-UI-fixes-for-logout-dialog.patch
+
 -------------------------------------------------------------------
 Sat Apr  8 11:43:07 UTC 2017 - fabian@ritter-vogt.de
 
diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec
index c88ad42..b263cd6 100644
--- a/plasma5-workspace.spec
+++ b/plasma5-workspace.spec
@@ -40,6 +40,8 @@ Patch1:         change-kioremote-severity.patch
 Patch2:         0001-Ignore-default-sddm-face-icons.patch
 # PATCHES 100-200 and above are from upstream 5.9 branch
 # PATCHES 201-300 and above are from upstream master/5.10 branch
+# PATCH-FIX-UPSTREAM
+Patch201:       0001-Some-UI-fixes-for-logout-dialog.patch
 BuildRequires:  breeze5-icons
 BuildRequires:  fdupes
 BuildRequires:  kf5-filesystem
@@ -212,6 +214,7 @@ workspace. Development files.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch201 -p1
 
 %build
   %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}