diff --git a/src/core/core.py b/src/core/core.py
index 805cd838..e38e37d1 100644
--- a/src/core/core.py
+++ b/src/core/core.py
@@ -35,7 +35,6 @@ from common import safeJID
 from config import config, firstrun
 from contact import Contact, Resource
 from daemon import Executor
-from data_forms import DataFormsTab
 from fifo import Fifo
 from keyboard import Keyboard
 from logger import logger
@@ -1165,7 +1164,7 @@ class Core(object):
         The callback are called with the completed form as parameter in
         addition with kwargs
         """
-        form_tab = DataFormsTab(form, on_cancel, on_send, kwargs)
+        form_tab = tabs.DataFormsTab(form, on_cancel, on_send, kwargs)
         self.add_tab(form_tab, True)
 
     ### Modifying actions ###
diff --git a/src/tabs/__init__.py b/src/tabs/__init__.py
index a0ad089b..67c686b5 100644
--- a/src/tabs/__init__.py
+++ b/src/tabs/__init__.py
@@ -7,3 +7,4 @@ from . conversationtab import ConversationTab, StaticConversationTab,\
         DynamicConversationTab
 from . xmltab import XMLTab
 from . muclisttab import MucListTab
+from . data_forms import DataFormsTab
diff --git a/src/data_forms.py b/src/tabs/data_forms.py
similarity index 100%
rename from src/data_forms.py
rename to src/tabs/data_forms.py