diff --git a/Plugins/OpenMPT/OpenMPT/OMPTContainer.mm b/Plugins/OpenMPT/OpenMPT/OMPTContainer.mm
index 77454169f..57946bfb6 100755
--- a/Plugins/OpenMPT/OpenMPT/OMPTContainer.mm
+++ b/Plugins/OpenMPT/OpenMPT/OMPTContainer.mm
@@ -63,12 +63,14 @@
         int i;
         int subsongs = mod->get_num_subsongs();
         
-        delete mod;
-        
         for (i = 0; i < subsongs; ++i) {
+            mod->select_subsong(i);
+            if (mod->get_duration_seconds() < 10.0) continue;
             [tracks addObject:[NSURL URLWithString:[[url absoluteString] stringByAppendingFormat:@"#%i", i]]];
         }
         
+        delete mod;
+        
         return tracks;
     } catch ( std::exception & /*e*/ ) {
         return 0;