1 files changed, 5 insertions, 2 deletions

diff --git a/keys.js b/keys.js
index 0bacf31..7cad8aa 100644
--- a/keys.js
+++ b/keys.js
@@ -39,14 +39,17 @@ rcube_webmail.prototype.inbox_keys_generate = function() {
             this.hide_message(generating_message);
             var lock = this.display_message(
                 this.get_label('inbox_settings.importing_key'), 'loading');
-            this.addEventListener('responseafter', () => {
+            this.addEventListener('responseafter', resp => {
+                if (resp.response.action != 'plugin.inbox_keys_import')
+                    return;
+
                 location.href =
                     'data:application/pgp-keys;base64,' + btoa(generated.privateKey);
                 this.reload(1500);
             });
             this.http_post(
                 'plugin.inbox_keys_import',
-                {import: true, refresh: false, key_data: generated.publicKey, comment},
+                {import: true, no_refresh: true, key_data: generated.publicKey, comment},
                 lock);
         });
 };