diff --git a/packages/core/src/container/Viewport/Viewport.vue b/packages/core/src/container/Viewport/Viewport.vue
index 3a7fc5fb..bee59d74 100644
--- a/packages/core/src/container/Viewport/Viewport.vue
+++ b/packages/core/src/container/Viewport/Viewport.vue
@@ -297,7 +297,10 @@ onMounted(() => {
     }
 
     // if the target element is inside an element with the nopan class, we prevent panning
-    if (isWrappedWithClass(event, noPanClassName.value) && event.type !== 'wheel') {
+    if (
+      isWrappedWithClass(event, noPanClassName.value) &&
+      ((!panOnScroll.value && event.type !== 'wheel') || (panOnScroll.value && event.type === 'wheel'))
+    ) {
       return false
     }