diff --git a/form_handler/gtk/form.py b/form_handler/gtk/form.py
index 0cddc25..e7873dd 100644
--- a/form_handler/gtk/form.py
+++ b/form_handler/gtk/form.py
@@ -15,10 +15,11 @@
 # along with Form Handler. If not, see <http://www.gnu.org/licenses/>.
 
 import nbxmpp
+from nbxmpp.modules.dataforms import extend_form
+
 from gi.repository import Gtk
 
 from gajim.common import app
-from gajim.common.modules.dataforms import extend_form
 from gajim.common.connection_handlers_events import MessageOutgoingEvent
 
 from gajim.gtk.dataform import DataFormWidget
diff --git a/form_handler/plugin.py b/form_handler/plugin.py
index ecae07c..4136cd4 100644
--- a/form_handler/plugin.py
+++ b/form_handler/plugin.py
@@ -17,9 +17,9 @@
 import logging
 
 import nbxmpp
+from nbxmpp.modules.dataforms import extend_form
 
 from gajim.common import ged
-from gajim.common.modules.dataforms import extend_form
 
 from gajim.plugins import GajimPlugin
 from gajim.plugins.plugins_i18n import _