diff --git a/0001-Workaround-the-lockscreen-password-field-focus-issue.patch b/0001-Workaround-the-lockscreen-password-field-focus-issue.patch
new file mode 100644
index 0000000..6ab4272
--- /dev/null
+++ b/0001-Workaround-the-lockscreen-password-field-focus-issue.patch
@@ -0,0 +1,35 @@
+From 24f24e03793c8214a5d1f3414a5aeb48eccef4f4 Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Wed, 25 Mar 2015 21:25:22 +0530
+Subject: [PATCH 1/1] Workaround the lockscreen password field focus issue
+
+Fixes bug 344823
+Backport of a476e1b6bf6f683bd74000bb30076868c9f92371 in 5.2
+
+CCMAIL: release-team@kde.org
+---
+ lookandfeel/contents/lockscreen/LockScreen.qml | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/lookandfeel/contents/lockscreen/LockScreen.qml b/lookandfeel/contents/lockscreen/LockScreen.qml
+index 8b013220eeec8402b9ce40466a32009a448155bb..ab554bd8a072688957cad24301b65d38b6383e9e 100644
+--- a/lookandfeel/contents/lockscreen/LockScreen.qml
++++ b/lookandfeel/contents/lockscreen/LockScreen.qml
+@@ -156,6 +156,14 @@ Image {
+                             enabled: !authenticator.graceLocked
+                             onAccepted: unlockFunction()
+                             focus: true
++                            //HACK: Similar hack is needed in sddm loginscreen
++                            //TODO: investigate
++                            Timer {
++                                interval: 200
++                                running: true
++                                repeat: false
++                                onTriggered: passwordInput.forceActiveFocus()
++                            }
+                             visible: block.mainItem.model.get(block.mainItem.selectedIndex)["showPassword"]
+                             onVisibleChanged: {
+                                 if (visible) {
+-- 
+2.3.3
+
diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes
index 50a2934..e4fd136 100644
--- a/plasma5-workspace.changes
+++ b/plasma5-workspace.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 25 16:07:02 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Add 0001-Workaround-the-lockscreen-password-field-focus-issue.patch
+  (kde#344823)
+
 -------------------------------------------------------------------
 Thu Mar 19 17:42:43 UTC 2015 - hrvoje.senjan@gmail.com
 
diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec
index 598505e..076eb22 100644
--- a/plasma5-workspace.spec
+++ b/plasma5-workspace.spec
@@ -33,6 +33,7 @@ Patch1:         create_kdehome.patch
 # PATCH-FIX_OPENSUSE 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins
 Patch2:         0003-Remove-export-of-QT_PLUGIN_PATH.patch
 # PATCHES 100-1000 and above are from upstream 5.2 branch
+Patch100:       0001-Workaround-the-lockscreen-password-field-focus-issue.patch
 # PATCHES 1000 and above are from upstream master/5.3 branch
 BuildRequires:  alsa-devel
 BuildRequires:  baloo5-devel >= %{version}
@@ -185,6 +186,7 @@ workspace. Development files.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch100 -p1
 
 %build
   %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5