diff --git a/libs/database/utils/dio.cpp b/libs/database/utils/dio.cpp
--- a/libs/database/utils/dio.cpp
+++ b/libs/database/utils/dio.cpp
@@ -117,6 +117,9 @@
 
 // ------------------------------------------------------------------------------------------------
 
+// TODO
+// Groups should not be resolved in dio, it should be handled in views.
+// This is already done for most things except for drag&drop, which is hard :)
 GroupedImagesFinder::GroupedImagesFinder(const QList<ImageInfo>& source)
 {
     process(source);
@@ -221,6 +224,16 @@
     QList<qlonglong> ids;
     QList<QUrl>      urls;
 
+    if (operation == Move)
+    {
+        // update the image infos
+        CoreDbAccess access;
+        foreach(const ImageInfo& info, finder.infos)
+        {
+            access.db()->moveItem(info.albumId(), info.name(), dest->id(), info.name());
+        }
+    }
+
     foreach(const ImageInfo& info, finder.infos)
     {
         filenames << info.name();
@@ -435,13 +448,6 @@
         return;
     }
 
-    // update the image infos
-    CoreDbAccess access;
-    foreach(const ImageInfo& info, infos)
-    {
-        access.db()->moveItem(info.albumId(), info.name(), dest->id(), info.name());
-    }
-
     instance()->d->imagesToAlbum(Move, infos, dest);
 }