diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx index c8f16af9e4..f7bd7f5ee0 100644 --- a/packages/excalidraw/components/App.tsx +++ b/packages/excalidraw/components/App.tsx @@ -7253,7 +7253,12 @@ class App extends React.Component { }); } - if ( + // Prioritize unlocked elements over locked ones + if (unlockedHitElements.length > 0) { + // If there are unlocked elements, use the topmost one + pointerDownState.hit.element = + unlockedHitElements[unlockedHitElements.length - 1]; + } else if ( hitElementMightBeLocked && hitElementMightBeLocked.locked && !unlockedHitElements.some(