diff --git a/data/gui/privacy_list_window.ui b/data/gui/privacy_list_window.ui
index a0e7e3edc..58ba7a9b6 100644
--- a/data/gui/privacy_list_window.ui
+++ b/data/gui/privacy_list_window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -47,6 +47,7 @@
     <property name="title" translatable="yes">Privacy List</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_privacy_list_edit_window_destroy" swapped="no"/>
+    <signal name="key-press-event" handler="on_key_press_event" swapped="no"/>
     <child>
       <object class="GtkBox" id="main_vbox">
         <property name="visible">True</property>
diff --git a/data/gui/privacy_lists_window.ui b/data/gui/privacy_lists_window.ui
index 4c49957dd..b9c6a1367 100644
--- a/data/gui/privacy_lists_window.ui
+++ b/data/gui/privacy_lists_window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
@@ -15,6 +15,7 @@
     <property name="title" translatable="yes">window1</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_privacy_lists_first_window_destroy" swapped="no"/>
+    <signal name="key-press-event" handler="on_key_press_event" swapped="no"/>
     <child>
       <object class="GtkBox" id="vbox1">
         <property name="visible">True</property>
@@ -30,8 +31,8 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Privacy Lists:</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/src/dialogs.py b/src/dialogs.py
index e1e95e385..2af26a88d 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -4370,6 +4370,10 @@ class PrivacyListWindow:
 
         self.xml.connect_signals(self)
 
+    def on_key_press_event(self, widget, event):
+        if event.keyval == Gdk.KEY_Escape:
+            self.window.destroy()
+
     def on_privacy_list_edit_window_destroy(self, widget):
         key_name = 'privacy_list_%s' % self.privacy_list_name
         if key_name in gajim.interface.instances[self.account]:
@@ -4684,6 +4688,10 @@ class PrivacyListsWindow:
 
         self.xml.connect_signals(self)
 
+    def on_key_press_event(self, widget, event):
+        if event.keyval == Gdk.KEY_Escape:
+            self.window.destroy()
+
     def on_privacy_lists_first_window_destroy(self, widget):
         if 'privacy_lists' in gajim.interface.instances[self.account]:
             del gajim.interface.instances[self.account]['privacy_lists']