diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nm-tray (0.4.1-0ubuntu2) eoan; urgency=medium
+
+  * Changed connection editor to nm-connnection-editor
+
+ -- Hans P Möller <hmollercl@lubuntu.me>  Mon, 01 Jul 2019 10:28:06 -0400
+
 nm-tray (0.4.1-0ubuntu1) cosmic; urgency=medium
 
   * New upstream bugfix release.
diff --git a/debian/patches/generalize-terminal-for-edits.patch b/debian/patches/nm-connection-editor.patch
rename from debian/patches/generalize-terminal-for-edits.patch
rename to debian/patches/nm-connection-editor.patch
--- a/debian/patches/generalize-terminal-for-edits.patch
+++ b/debian/patches/nm-connection-editor.patch
@@ -1,10 +1,12 @@
-Description: Use x-terminal emulator in lieu of xterm for connection edits.
+Description: Use nm-connection-editor from network-manager-gnomer for connection edits.
 Author: Walter Lapchynski <wxl@ubuntu.com>
 Bug: https://launchpad.net/bugs/1786978
+Modified: Hans P. Möller
+Bug: https://launchpad.net/bugs/1810095
 --- 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
++connectionsEditor=nm-connection-editor
  enableNotifications=true
diff --git a/debian/patches/series b/debian/patches/series
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-generalize-terminal-for-edits.patch
+nm-connection-editor.patch
 blacklist-from-menu.patch