diff --git a/openpgp/gtk/wizard.py b/openpgp/gtk/wizard.py
index 4195f81..a64dbe1 100644
--- a/openpgp/gtk/wizard.py
+++ b/openpgp/gtk/wizard.py
@@ -46,7 +46,7 @@ class KeyWizard(Gtk.Assistant):
         self._chat_control = chat_control
 
         self.set_application(app.app)
-        self.set_transient_for(chat_control.parent_win.window)
+        self.set_transient_for(app.window)
         self.set_resizable(True)
         self.set_position(Gtk.WindowPosition.CENTER)
 
@@ -79,8 +79,7 @@ class KeyWizard(Gtk.Assistant):
         main_box.remove(sidebar)
 
     def _activate_encryption(self):
-        win = self._chat_control.parent_win.window
-        action = win.lookup_action(
+        action = app.window.lookup_action(
             'set-encryption-%s' % self._chat_control.control_id)
         action.activate(GLib.Variant("s", self._plugin.encryption_name))
 
diff --git a/openpgp/pgpplugin.py b/openpgp/pgpplugin.py
index 4ca0b03..2ce5850 100644
--- a/openpgp/pgpplugin.py
+++ b/openpgp/pgpplugin.py
@@ -15,7 +15,6 @@
 # along with OpenPGP Gajim Plugin. If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import os
 from pathlib import Path
 
 from gi.repository import Gtk
@@ -26,7 +25,6 @@ from nbxmpp import JID
 from gajim.common import app
 from gajim.common import ged
 from gajim.common import configpaths
-from gajim.common import helpers
 from gajim.common.const import CSSPriority
 
 from gajim.gui.dialogs import ErrorDialog
@@ -160,10 +158,9 @@ class OpenPGPPlugin(GajimPlugin):
     def on_encryption_button_clicked(chat_control):
         account = chat_control.account
         jid = chat_control.contact.jid
-        transient = chat_control.parent_win.window
 
         from openpgp.gtk.key import KeyDialog
-        KeyDialog(account, jid, transient)
+        KeyDialog(account, jid, app.window)
 
     def _before_sendmessage(self, chat_control):
         account = chat_control.account