diff --git a/src/dialogs.py b/src/dialogs.py
index 5aa563ba4..9fdf684cc 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -2571,7 +2571,7 @@ class JoinGroupchatWindow:
             ErrorDialog(_('This is not a group chat'),
                 _('%s is not the name of a group chat.') % room_jid)
             return
-        
+
         full_jid = room_jid + '/' + nickname
         if full_jid in self.recently_groupchat:
             self.recently_groupchat.remove(full_jid)
diff --git a/src/plugins/gui.py b/src/plugins/gui.py
index b97711d9b..16d907501 100644
--- a/src/plugins/gui.py
+++ b/src/plugins/gui.py
@@ -315,19 +315,22 @@ class GajimPluginConfigDialog(Gtk.Dialog):
         Gtk.Dialog.__init__(self, '%s %s'%(plugin.name, _('Configuration')),
                                                                     **kwargs)
         self.plugin = plugin
-        self.add_button('gtk-close', Gtk.ResponseType.CLOSE)
+        button = self.add_button('gtk-close', Gtk.ResponseType.CLOSE)
+        button.connect('clicked', self.on_close_button_clicked)
 
         self.get_child().set_spacing(3)
 
         self.init()
 
+    def on_close_button_clicked(self, widget):
+        self.hide()
+
     @log_calls('GajimPluginConfigDialog')
     def run(self, parent=None):
         self.set_transient_for(parent)
         self.on_run()
         self.show_all()
-        result =  super(GajimPluginConfigDialog, self).run()
-        self.hide()
+        result =  super(GajimPluginConfigDialog, self)
         return result
 
     def init(self):