diff --git a/gramps/gui/plug/_guioptions.py b/gramps/gui/plug/_guioptions.py
index 1b1d438df..89159ee16 100644
--- a/gramps/gui/plug/_guioptions.py
+++ b/gramps/gui/plug/_guioptions.py
@@ -1643,6 +1643,7 @@ class GuiDestinationOption(Gtk.Box):
         """
         Gtk.Box.__init__(self)
         self.__option = option
+        self.__uistate = uistate
         self.__entry = Gtk.Entry()
         self.__entry.set_text( self.__option.get_value() )
 
@@ -1695,6 +1696,7 @@ class GuiDestinationOption(Gtk.Box):
             my_action = Gtk.FileChooserAction.SAVE
 
         fcd = Gtk.FileChooserDialog(_("Save As"), action=my_action,
+                                    parent=self.__uistate.window,
                                     buttons=(_('_Cancel'),
                                              Gtk.ResponseType.CANCEL,
                                              _('_Open'),
diff --git a/gramps/gui/plug/_windows.py b/gramps/gui/plug/_windows.py
index 8202ef252..45903a541 100644
--- a/gramps/gui/plug/_windows.py
+++ b/gramps/gui/plug/_windows.py
@@ -423,6 +423,7 @@ class PluginStatus(ManagedWindow):
         Select a file from the file system.
         """
         fcd = Gtk.FileChooserDialog(_("Load Addon"),
+                                    parent=self.__uistate.window,
                                     buttons=(_('_Cancel'),
                                              Gtk.ResponseType.CANCEL,
                                              _('_Open'),
diff --git a/gramps/plugins/lib/maps/geography.py b/gramps/plugins/lib/maps/geography.py
index 3b6568e8e..bfc2fcaa7 100644
--- a/gramps/plugins/lib/maps/geography.py
+++ b/gramps/plugins/lib/maps/geography.py
@@ -938,6 +938,7 @@ class GeoGraphyView(OsmGps, NavigationView):
         kml = Gtk.FileChooserDialog(
             _("Select a kml file used to add places"),
             action=Gtk.FileChooserAction.OPEN,
+            parent=self.uistate.window,
             buttons=(_('_Cancel'), Gtk.ResponseType.CANCEL,
                      _('_Apply'), Gtk.ResponseType.OK))
         mpath = HOME_DIR
@@ -1182,6 +1183,7 @@ class GeoGraphyView(OsmGps, NavigationView):
         f = Gtk.FileChooserDialog(
             _("Select tile cache directory for offline mode"),
             action=Gtk.FileChooserAction.SELECT_FOLDER,
+            parent=self.uistate.window,
             buttons=(_('_Cancel'),
                      Gtk.ResponseType.CANCEL,
                      _('_Apply'),
diff --git a/gramps/plugins/tool/check.py b/gramps/plugins/tool/check.py
index ab650c029..0bf982b24 100644
--- a/gramps/plugins/tool/check.py
+++ b/gramps/plugins/tool/check.py
@@ -690,6 +690,7 @@ class CheckIntegrity(object):
                     logging.warning('    FAIL: references to missing file kept')
 
             fs_top = Gtk.FileChooserDialog("%s - Gramps" % _("Select file"),
+                        parent=self.parent_window,
                         buttons=(_('_Cancel'), Gtk.ResponseType.CANCEL,
                                  _('_OK'), Gtk.ResponseType.OK)
                         )