diff --git a/gramps/gui/configure.py b/gramps/gui/configure.py
index a7c49ab67..51bed5796 100644
--- a/gramps/gui/configure.py
+++ b/gramps/gui/configure.py
@@ -1330,7 +1330,8 @@ class GrampsPreferences(ConfigureDialog):
 
         if len(addon_update_list) > 0:
             try:
-                PluginWindows.UpdateAddons(self.uistate, [], addon_update_list)
+                PluginWindows.UpdateAddons(self.uistate, [], addon_update_list,
+                                                            parent=self.window)
             except WindowActiveError:
                 pass
         else:
diff --git a/gramps/gui/plug/_windows.py b/gramps/gui/plug/_windows.py
index c07b44a4f..e1d1ed4aa 100644
--- a/gramps/gui/plug/_windows.py
+++ b/gramps/gui/plug/_windows.py
@@ -1070,7 +1070,7 @@ class ToolManagedWindow(tool.Tool, ToolManagedWindowBase):
 #-------------------------------------------------------------------------
 class UpdateAddons(ManagedWindow):
 
-    def __init__(self, uistate, track, addon_update_list):
+    def __init__(self, uistate, track, addon_update_list, parent=None):
         self.title = _('Available Gramps Updates for Addons')
         ManagedWindow.__init__(self, uistate, track, self.__class__)
 
@@ -1080,8 +1080,8 @@ class UpdateAddons(ManagedWindow):
                         self.title)
         self.window.set_size_request(750, 400)
 
-        if win() and Gtk.get_minor_version() < 11:
-            self.window.set_transient_for(self.window.get_toplevel())
+        if win():
+            self.window.set_transient_for(parent)
 
         apply_button = glade.get_object('apply')
         cancel_button = glade.get_object('cancel')
diff --git a/gramps/gui/viewmanager.py b/gramps/gui/viewmanager.py
index d5fabf5fa..20bc4f50f 100644
--- a/gramps/gui/viewmanager.py
+++ b/gramps/gui/viewmanager.py
@@ -344,7 +344,8 @@ class ViewManager(CLIManager):
         Called when add-on updates are available.
         """
         try:
-            PluginWindows.UpdateAddons(self.uistate, [], addon_update_list)
+            PluginWindows.UpdateAddons(self.uistate, [], addon_update_list,
+                                                        parent=self.window)
         except WindowActiveError:
             pass