diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py
index ac90a0dd5..29ab9f6f3 100644
--- a/src/gui/views/listview.py
+++ b/src/gui/views/listview.py
@@ -168,6 +168,11 @@ class ListView(NavigationView):
                                     [self.drag_dest_info().target()], 
                                     Gdk.DragAction.MOVE |
                                     Gdk.DragAction.COPY)
+            tglist = Gtk.TargetList.new([])
+            tglist.add(self.drag_dest_info().atom_drag_type, 
+                       self.drag_dest_info().target_flags,
+                       self.drag_dest_info().app_id)
+            self.list.drag_dest_set_target_list(tglist)
 
         scrollwindow = Gtk.ScrolledWindow()
         scrollwindow.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
diff --git a/src/plugins/lib/libmetadata.py b/src/plugins/lib/libmetadata.py
index a345c8795..06c51d137 100644
--- a/src/plugins/lib/libmetadata.py
+++ b/src/plugins/lib/libmetadata.py
@@ -21,6 +21,19 @@
 #
 # $Id$
 #
+#-------------------------------------------------------------------------
+#
+# GNOME modules
+#
+#-------------------------------------------------------------------------
+from gi.repository import GObject
+from gi.repository import Gtk
+
+#-------------------------------------------------------------------------
+#
+# Gramps modules
+#
+#-------------------------------------------------------------------------
 
 from gui.listmodel import ListModel
 from gen.ggettext import gettext as _
@@ -29,7 +42,6 @@ from fractions import Fraction
 import gen.lib
 import gen.datehandler
 import datetime
-from gi.repository import Gtk
 import pyexiv2
 
 # v0.1 has a different API to v0.2 and above