diff --git a/debian/changelog b/debian/changelog
index b9c4b5c..49d3552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lxqt-globalkeys (0.12.0-3ubuntu1) UNRELEASED; urgency=medium
+
+  * Cherry-pick some upstream commits because the upstream release cycle is
+    too slow:
+    - Fix wrong radio buttons when changing shortcuts.
+      + fix-wrong-radio-buttons.patch
+      + Upstream commit a9ec3c0.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 05 Feb 2018 20:38:35 -0600
+
 lxqt-globalkeys (0.12.0-3) unstable; urgency=medium
 
   * Bumped Standards to 4.1.2, no changes needed
diff --git a/debian/patches/fix-wrong-radio-buttons.patch b/debian/patches/fix-wrong-radio-buttons.patch
new file mode 100644
index 0000000..a470ca4
--- /dev/null
+++ b/debian/patches/fix-wrong-radio-buttons.patch
@@ -0,0 +1,25 @@
+Description: Fix wrong radio buttons when changing shortcuts
+ When the dialog box was displayed, the radio buttons were not
+ initialized correctly if a client-type action was to be modified.
+Author: ska67 <git17@ska67.de>
+Origin: backport
+Bug: https://github.com/lxde/lxqt/issues/1376
+Applied-Upstream: commit:a9ec3c0
+Last-Update: 2018-02-05
+--- a/config/edit_action_dialog.cpp
++++ b/config/edit_action_dialog.cpp
+@@ -197,6 +197,14 @@ bool EditActionDialog::load(qulonglong i
+         else
+         {
+             command_PTE->clear();
++
++            // To disable all radio boxes, once one has been selected, we need to turn exclusivity off temporarily
++            command_RB->setAutoExclusive(false);
++            dbus_method_RB->setAutoExclusive(false);
++            command_RB->setChecked(false);
++            dbus_method_RB->setChecked(false);
++            command_RB->setAutoExclusive(true);
++            dbus_method_RB->setAutoExclusive(true);
+         }
+ 
+         description_LE->setEnabled(canEdit);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6db0d9e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+# Ubuntu-specific patches
+fix-wrong-radio-buttons.patch