diff --git a/gajim/options_dialog.py b/gajim/options_dialog.py
index b1f74ab5e0b448876400c847abf0dade7b57790b..a07cbe6c8d932374d8988cd0a946988fcf3edc51 100644
--- a/gajim/options_dialog.py
+++ b/gajim/options_dialog.py
@@ -35,6 +35,11 @@ class OptionsDialog(Gtk.ApplicationWindow):
 
         self.show_all()
         self.listbox.connect('row-activated', self.on_row_activated)
+        self.connect('key-press-event', self.on_key_press)
+
+    def on_key_press(self, widget, event):
+        if event.keyval == Gdk.KEY_Escape:
+            self.destroy()
 
     @staticmethod
     def on_row_activated(listbox, row):