diff --git a/packages/system/src/xypanzoom/filter.ts b/packages/system/src/xypanzoom/filter.ts
index 232c66af..c0d0addd 100644
--- a/packages/system/src/xypanzoom/filter.ts
+++ b/packages/system/src/xypanzoom/filter.ts
@@ -59,7 +59,10 @@ export function createFilter({
     }
 
     // if the target element is inside an element with the nopan class, we prevent panning
-    if (isWrappedWithClass(event, noPanClassName) && event.type !== 'wheel') {
+    if (
+      isWrappedWithClass(event, noPanClassName) &&
+      ((!panOnScroll && event.type !== 'wheel') || (panOnScroll && event.type === 'wheel'))
+    ) {
       return false;
     }