diff --git a/gajim/atom_window.py b/gajim/gtk/atom.py
similarity index 97%
rename from gajim/atom_window.py
rename to gajim/gtk/atom.py
index 70c8cc593..79f6875df 100644
--- a/gajim/atom_window.py
+++ b/gajim/gtk/atom.py
@@ -27,7 +27,7 @@ from gajim.common import helpers
 from gajim.common import i18n
 from gajim.common.i18n import _
 
-from gajim import gtkgui_helpers
+from gajim.gtk.util import get_builder
 
 class AtomWindow:
     window = None
@@ -57,7 +57,7 @@ class AtomWindow:
 
         self.entry = None # the entry actually displayed
 
-        self.xml = gtkgui_helpers.get_gtk_builder('atom_entry_window.ui')
+        self.xml = get_builder('atom_entry_window.ui')
         self.window = self.xml.get_object('atom_entry_window')
         for name in ('new_entry_label', 'feed_title_label',
         'feed_title_eventbox', 'feed_tagline_label', 'entry_title_label',
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 9e1e00ab6..5e3ea0507 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -76,7 +76,6 @@ from gajim.groupchat_control import PrivateChatControl
 from gajim.message_window import MessageWindowMgr
 from gajim.filetransfers_window import FileTransfersWindow
 
-from gajim.atom_window import AtomWindow
 from gajim.session import ChatControlSession
 
 from gajim.common import idle
@@ -121,6 +120,7 @@ from gajim.gtk.filechoosers import FileChooserDialog
 from gajim.gtk.emoji_data import emoji_data
 from gajim.gtk.emoji_data import emoji_ascii_data
 from gajim.gtk.groupchat_config import GroupchatConfig
+from gajim.gtk.atom import AtomWindow
 
 
 parser = optparser.OptionsParser(configpaths.get('CONFIG_FILE'))