diff --git a/gramps/plugins/importer/importgedcom.py b/gramps/plugins/importer/importgedcom.py
index 3f972ee99..9e87136ee 100644
--- a/gramps/plugins/importer/importgedcom.py
+++ b/gramps/plugins/importer/importgedcom.py
@@ -98,6 +98,7 @@ def importData(database, filename, user):
         code = top.get_object('codeset')
         code.set_active(0)
         dialog = top.toplevel
+        dialog.set_transient_for(user.uistate.window)
         dialog.run()
         enc = ['ANSEL', 'ANSEL', 'ANSI', 'ASCII', 'UTF-8']
         code_set = enc[ code.get_active()]
diff --git a/gramps/plugins/lib/libgedcom.py b/gramps/plugins/lib/libgedcom.py
index e8b724ffd..0cb1657f5 100644
--- a/gramps/plugins/lib/libgedcom.py
+++ b/gramps/plugins/lib/libgedcom.py
@@ -7301,11 +7301,12 @@ class GedcomParser(UpdateCallback):
         # coding is now wrong.
         if self.genby.upper() == "LEGACY":
             fname = os.path.basename(self.filename)
-            WarningDialog( # no-parent
+            WarningDialog( # parent-OK
                _("Import of GEDCOM file %(filename)s with DEST=%(by)s, "
                  "could cause errors in the resulting database!")
                    % {'filename': fname, 'by': self.genby},
-               _("Look for nameless events.")
+               _("Look for nameless events."),
+               parent=self.user.uistate.window
                )
 
     def __header_char(self, line, state):