diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/overlays/static-canvas-overlay.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/overlays/static-canvas-overlay.component.ts
index 9663b25e9f5195dab3eb4d5d518642fabec932e2..911f69ebbf8eec7e290c06b8144a64e614073b13 100644
--- a/projects/editor/src/app/components/unit-view/page-view/canvas/overlays/static-canvas-overlay.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/canvas/overlays/static-canvas-overlay.component.ts
@@ -11,11 +11,11 @@ import { UIElement } from '../../../../../../../../common/models/uI-element';
     <!-- TabIndex is needed to make the div selectable and catch keyboard events (delete). -->
     <div class="draggable-element"
          [class.temporaryHighlight]="temporaryHighlight"
-         cdkDrag [cdkDragData]="{dragType: 'move', element: element}"
-         (click)="selectElement($event.shiftKey); $event.stopPropagation()"
-         (cdkDragStarted)="!isSelected && selectElement()"
+         (click)="!isSelected && selectElement($event.shiftKey); $event.stopPropagation()"
          (dblclick)="openEditDialog()"
          (keyup.delete)="deleteSelectedElements()" tabindex="-1"
+         cdkDrag [cdkDragData]="{dragType: 'move', element: element}"
+         (cdkDragStarted)="!isSelected && selectElement()"
          cdkDropList>
       <div *cdkDragPlaceholder></div>
       <!-- Needs extra div because styling can interfere with drag and drop-->