diff --git a/gajim/filetransfers_window.py b/gajim/filetransfers_window.py
index 4795b2fbd..f9331f2a5 100644
--- a/gajim/filetransfers_window.py
+++ b/gajim/filetransfers_window.py
@@ -48,7 +48,7 @@ from gajim.common import helpers
 from gajim.common.file_props import FilesProp
 from gajim.common.protocol.bytestream import (is_transfer_active, is_transfer_paused,
         is_transfer_stopped)
-from gajim.filechoosers import FileSaveDialog, FileChooserDialog
+from gajim.gtk.filechoosers import FileSaveDialog, FileChooserDialog
 from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5
 import logging
 log = logging.getLogger('gajim.filetransfer_window')
diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py
index 8b11e4c92..66d56556f 100644
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -63,7 +63,7 @@ from gajim.common.const import StyleAttr
 
 from gajim.chat_control import ChatControl
 from gajim.chat_control_base import ChatControlBase
-from gajim.filechoosers import AvatarChooserDialog
+from gajim.gtk.filechoosers import AvatarChooserDialog
 from gajim.gtk import ErrorDialog
 from gajim.gtk import InputTextDialog
 from gajim.gtk import ConfirmationDialogCheck
diff --git a/gajim/filechoosers.py b/gajim/gtk/filechoosers.py
similarity index 99%
rename from gajim/filechoosers.py
rename to gajim/gtk/filechoosers.py
index e4323cd9f..ea16d7fbc 100644
--- a/gajim/filechoosers.py
+++ b/gajim/gtk/filechoosers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com>
 #
 # This file is part of Gajim.
diff --git a/gajim/gtk/profile.py b/gajim/gtk/profile.py
index ee513b50e..cda709482 100644
--- a/gajim/gtk/profile.py
+++ b/gajim/gtk/profile.py
@@ -29,7 +29,7 @@ from gajim import gtkgui_helpers
 from gajim.gtk import ErrorDialog
 from gajim.gtk import InformationDialog
 from gajim.gtk.util import get_builder
-from gajim.filechoosers import AvatarChooserDialog
+from gajim.gtk.filechoosers import AvatarChooserDialog
 from gajim.common.const import AvatarSize
 from gajim.common import app
 from gajim.common import ged
diff --git a/gajim/gtkgui_helpers.py b/gajim/gtkgui_helpers.py
index b170f0fe8..040dcd7b8 100644
--- a/gajim/gtkgui_helpers.py
+++ b/gajim/gtkgui_helpers.py
@@ -52,7 +52,6 @@ from gajim.common import i18n
 from gajim.common import app
 from gajim.common import configpaths
 from gajim.common.const import PEPEventType, ACTIVITIES, MOODS
-from gajim.filechoosers import AvatarSaveDialog
 
 gtk_icon_theme = Gtk.IconTheme.get_default()
 gtk_icon_theme.append_search_path(configpaths.get('ICONS'))
@@ -464,6 +463,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''):
     from gajim.gtk import ErrorDialog
     from gajim.gtk import ConfirmationDialog
     from gajim.gtk import FTOverwriteConfirmationDialog
+    from gajim.gtk.filechoosers import AvatarSaveDialog
     def on_continue(response, file_path):
         if response < 0:
             return
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 7ffb19f63..5080583ba 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -70,7 +70,7 @@ from gajim import message_control
 from gajim.dialog_messages import get_dialog
 from gajim.dialogs import ProgressWindow
 
-from gajim.filechoosers import FileChooserDialog
+from gajim.gtk.filechoosers import FileChooserDialog
 
 from gajim.chat_control_base import ChatControlBase
 from gajim.chat_control import ChatControl
diff --git a/gajim/history_manager.py b/gajim/history_manager.py
index a87157e6b..625b55f30 100644
--- a/gajim/history_manager.py
+++ b/gajim/history_manager.py
@@ -88,7 +88,7 @@ from gajim.common import helpers
 from gajim.gtk import YesNoDialog
 from gajim.gtk import ErrorDialog
 from gajim.gtk import ConfirmationDialog
-from gajim.filechoosers import FileSaveDialog
+from gajim.gtk.filechoosers import FileSaveDialog
 from gajim import gtkgui_helpers
 
 
diff --git a/gajim/plugins/gui.py b/gajim/plugins/gui.py
index 70a0b290d..7798641b3 100644
--- a/gajim/plugins/gui.py
+++ b/gajim/plugins/gui.py
@@ -36,7 +36,7 @@ from enum import IntEnum, unique
 from gajim import gtkgui_helpers
 from gajim.gtk import WarningDialog
 from gajim.gtk import YesNoDialog
-from gajim.filechoosers import ArchiveChooserDialog
+from gajim.gtk.filechoosers import ArchiveChooserDialog
 from gajim.common import app
 from gajim.common import configpaths
 from gajim.plugins.helpers import log_calls