diff --git a/debian/changelog b/debian/changelog
index 74c06a1..4aab81d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 nm-tray (0.4.0-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Simon Quigley ]
   * Update Vcs-* for the new location.
 
+  [ Walter Lapchynski ]
+  * generalize-terminal-for-edits.patch: Use x-terminal-emulator in lieu of
+    xterm for connection editing. (LP: #1786978)
+
  -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 05 Jul 2018 17:48:30 -0500
 
 nm-tray (0.4.0-0ubuntu1) cosmic; urgency=medium
diff --git a/debian/patches/generalize-terminal-for-edits.patch b/debian/patches/generalize-terminal-for-edits.patch
new file mode 100644
index 0000000..692b839
--- /dev/null
+++ b/debian/patches/generalize-terminal-for-edits.patch
@@ -0,0 +1,10 @@
+Description: Use x-terminal emulator in lieu of xterm for connection edits.
+Author: Walter Lapchynski <wxl@ubuntu.com>
+Bug: https://launchpad.net/bugs/1786978 
+--- a/resources/nm-tray.conf
++++ b/resources/nm-tray.conf
+@@ -1,3 +1,3 @@
+ [General]
+-connectionsEditor=xterm, -e, nmtui-edit
++connectionsEditor=x-terminal-emulator, -e, nmtui-edit
+ enableNotifications=true
diff --git a/debian/patches/series b/debian/patches/series
index 0823679..a00b3b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-internal-version.patch
+generalize-terminal-for-edits.patch