diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index e8cdc64b8..178860e2e 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -504,16 +504,7 @@ PartitionCoreModule::scanForEfiSystemPartitions()
     }
 
     QList< Partition* > efiSystemPartitions =
-        KPMHelpers::findPartitions( devices,
-                                    []( Partition* partition ) -> bool
-    {
-        if ( partition->activeFlags().testFlag( PartitionTable::FlagEsp ) )
-        {
-            cDebug() << "Found EFI system partition at" << partition->partitionPath();
-            return true;
-        }
-        return false;
-    } );
+        KPMHelpers::findPartitions( devices, PartUtils::isEfiBootable );
 
     if ( efiSystemPartitions.isEmpty() )
         cDebug() << "WARNING: system is EFI but no EFI system partitions found.";