diff --git a/picard/tagger.py b/picard/tagger.py
index 6d32e86c6..b5f2cd692 100644
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -842,12 +842,15 @@ class Tagger(QtWidgets.QApplication):
             files = list(self.unclustered_files.files)
         else:
             files = self.get_files_from_objects(objs)
+
+        self.window.panel.set_sorting(False)
         for name, artist, files in Cluster.cluster(files, 1.0):
             QtCore.QCoreApplication.processEvents()
             cluster = self.load_cluster(name, artist)
             for file in sorted(files, key=attrgetter('discnumber', 'tracknumber', 'base_filename')):
                 file.move(cluster)
                 QtCore.QCoreApplication.processEvents()
+        self.window.panel.set_sorting(True)
 
     def load_cluster(self, name, artist):
         for cluster in self.clusters: