diff --git a/src/lib/elements/connections/Line.ts b/src/lib/elements/connections/Line.ts
index 6efd410404db3afb7b93deb35bdeb54696b27754..d2fb7eea3be5fb92462f7638a3f3822c917f9293 100644
--- a/src/lib/elements/connections/Line.ts
+++ b/src/lib/elements/connections/Line.ts
@@ -1952,6 +1952,9 @@ export class Line extends BaseElementContainer<Models.Line, BaseElementContainer
     public controlUnselectItem(image: MedsurfDraw.Image): void {
         // Set select layer
         if(!this.controlSelectLayerGroup(image)) {
+            // Set select image
+            image.externControlSelectImage();
+
             // Emits
             image.unselectImageObject();
         }
diff --git a/src/lib/elements/fills/FillCollection.ts b/src/lib/elements/fills/FillCollection.ts
index 1a37fa02584301853f23fd251ea49780fd6aa3e4..a2fb9889c6134d9b5cacb457895ca8be0fe8afbd 100644
--- a/src/lib/elements/fills/FillCollection.ts
+++ b/src/lib/elements/fills/FillCollection.ts
@@ -1542,6 +1542,9 @@ export class FillCollection extends BaseElementContainer<Models.FillCollection,
     public controlUnselectItem(image: MedsurfDraw.Image): void {
         // Set select layer
         if(!this.controlSelectLayerGroup(image)) {
+            // Set select image
+            image.externControlSelectImage();
+
             // Emits
             image.unselectImageObject();
         }
diff --git a/src/lib/elements/images/Image.ts b/src/lib/elements/images/Image.ts
index 0cd0e41f72907b7d24f3904899adf7b480e978ac..fab773e8dbf3fcb67d8ee6334362a191d1655abe 100644
--- a/src/lib/elements/images/Image.ts
+++ b/src/lib/elements/images/Image.ts
@@ -2069,6 +2069,14 @@ export class Image extends BaseContainer<ImageModel> {
     //</editor-fold>
 
     //<editor-fold desc="Extern control">
+    /**
+     * Extern control select image
+     */
+    public externControlSelectImage(): void {
+        // Setup image
+        this.controlSetDefaultMode(new PIXI.InteractionEvent());
+    }
+
     /**
      * Extern control select grouping
      * @param model
diff --git a/src/lib/elements/legends/LegendCollection.ts b/src/lib/elements/legends/LegendCollection.ts
index 306a0c4806cbdc9257289873073c7ec3431956f8..089c5c6c121560f0b220dc5cc34f81ed4ca89033 100644
--- a/src/lib/elements/legends/LegendCollection.ts
+++ b/src/lib/elements/legends/LegendCollection.ts
@@ -1142,6 +1142,9 @@ export class LegendCollection extends BaseElementContainer<Models.LegendCollecti
     public controlUnselectItem(image: MedsurfDraw.Image): void {
         // Set select layer
         if(!this.controlSelectLayerGroup(image)) {
+            // Set select image
+            image.externControlSelectImage();
+
             // Emits
             image.unselectImageObject();
         }
diff --git a/src/lib/elements/positionings/PositionPoint.ts b/src/lib/elements/positionings/PositionPoint.ts
index afffb8a44c4ec926a9dd492d2d4efe3e00d9e102..bcc1fa9837904e53fb2860b97cfc8ec3945eeb08 100644
--- a/src/lib/elements/positionings/PositionPoint.ts
+++ b/src/lib/elements/positionings/PositionPoint.ts
@@ -1256,13 +1256,12 @@ export class PositionPoint extends BaseElementContainer<Models.PositionPoint, Ba
      */
     public controlUnselectItem(image: MedsurfDraw.Image): void {
         // Set select layer
-        console.log("controlUnselectItem");
         if(!this.controlSelectLayerGroup(image)) {
+            // Set select image
+            image.externControlSelectImage();
+
             // Emits
             image.unselectImageObject();
-
-            // TODO this -> create functions on image to handle all this stuff -> select layergroup / grouping / image / etc
-            // image.externControl
         }
     }
 
diff --git a/src/lib/elements/primitives/ArrowPrimitive.ts b/src/lib/elements/primitives/ArrowPrimitive.ts
index fb330ffa62693e4b16f31f5c9df5390f096f27c0..8f51d1c9e9d8067a7b3d82f9609d18dfc2111e6c 100644
--- a/src/lib/elements/primitives/ArrowPrimitive.ts
+++ b/src/lib/elements/primitives/ArrowPrimitive.ts
@@ -1315,6 +1315,9 @@ export class ArrowPrimitive extends BaseElementContainer<Models.ArrowPrimitive,
 
         // Set select layer
         if(!parent.controlSelectLayerGroup(image)) {
+            // Set select image
+            image.externControlSelectImage();
+
             // Emits
             image.unselectPrimitive();
         }
diff --git a/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts b/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts
index 3b5099f84bc464f5b754822bee9615248b1c266a..93b2d7c230d94e92ee04e80959f6fd0bc1639171 100644
--- a/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts
+++ b/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts
@@ -1294,6 +1294,9 @@ export class BackgroundRectanglePrimitive extends BaseElementContainer<Models.Ba
 
         // Set select layer
         if(!parent.controlSelectLayerGroup(image)) {
+            // Set select image
+            image.externControlSelectImage();
+
             // Emits
             image.unselectPrimitive();
         }
diff --git a/src/lib/elements/primitives/EllipsePrimitive.ts b/src/lib/elements/primitives/EllipsePrimitive.ts
index 0d5b18be4e43921e62bb8e60b6f95128d041fe13..6a8d3f64fb22efd9a51ff1b273f58aa4d30c25a2 100644
--- a/src/lib/elements/primitives/EllipsePrimitive.ts
+++ b/src/lib/elements/primitives/EllipsePrimitive.ts
@@ -1287,6 +1287,9 @@ export class EllipsePrimitive extends BaseElementContainer<Models.EllipsePrimiti
 
         // Set select layer
         if(!parent.controlSelectLayerGroup(image)) {
+            // Set select image
+            image.externControlSelectImage();
+
             // Emits
             image.unselectPrimitive();
         }
diff --git a/src/lib/elements/primitives/RectanglePrimitive.ts b/src/lib/elements/primitives/RectanglePrimitive.ts
index 7de1c4d90e33a5a01aa19ac2d21ccf10ff878f4f..8e5e575a4262b80e36ba3f182433397ef5869cb5 100644
--- a/src/lib/elements/primitives/RectanglePrimitive.ts
+++ b/src/lib/elements/primitives/RectanglePrimitive.ts
@@ -1288,6 +1288,9 @@ export class RectanglePrimitive extends BaseElementContainer<Models.RectanglePri
 
         // Set select layer
         if(!parent.controlSelectLayerGroup(image)) {
+            // Set select image
+            image.externControlSelectImage();
+
             // Emits
             image.unselectPrimitive();
         }
diff --git a/src/lib/elements/primitives/TextPrimitive.ts b/src/lib/elements/primitives/TextPrimitive.ts
index bd1db86bf5036e37106598e7b2f7a29bbe89f831..b2aed46a51266389769c08582dabd3772648ed87 100644
--- a/src/lib/elements/primitives/TextPrimitive.ts
+++ b/src/lib/elements/primitives/TextPrimitive.ts
@@ -1489,6 +1489,9 @@ export class TextPrimitive extends BaseElementContainer<Models.TextPrimitive, Ba
 
         // Set select layer
         if(!parent.controlSelectLayerGroup(image)) {
+            // Set select image
+            image.externControlSelectImage();
+
             // Emits
             image.unselectPrimitive();
         }