diff --git a/src/config.py b/src/config.py
index 39453fcf6..c43f4555b 100644
--- a/src/config.py
+++ b/src/config.py
@@ -2167,7 +2167,8 @@ class AccountsWindow:
         message = _('Enter a new name for account %s') % self.current_account
         old_text = self.current_account
         dialogs.InputDialog(title, message, old_text, is_modal=False,
-                ok_handler=(on_renamed, self.current_account))
+            ok_handler=(on_renamed, self.current_account),
+            transient_for=self.window)
 
     def option_changed(self, option, value):
         return gajim.config.get_per('accounts', self.current_account, option) \
diff --git a/src/gui_interface.py b/src/gui_interface.py
index b8727c8de..6b4356a3e 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -1175,7 +1175,7 @@ class Interface:
         dlg = dialogs.InputDialog(_('Username Conflict'),
             _('Please type a new username for your local account'),
             input_str=obj.alt_name, is_modal=True, ok_handler=on_ok,
-            cancel_handler=on_cancel)
+            cancel_handler=on_cancel, transient_for=self.roster.window)
 
     def handle_event_resource_conflict(self, obj):
         # ('RESOURCE_CONFLICT', account, ())