diff --git a/FloatingSpace/FloatingLayer.js b/FloatingSpace/FloatingLayer.js
index 6208366ef..413ea80ec 100644
--- a/FloatingSpace/FloatingLayer.js
+++ b/FloatingSpace/FloatingLayer.js
@@ -910,8 +910,12 @@ function newFloatingLayer () {
       pos2.x = pos2.x - minTD.x * (im2 / (im1 + im2))
       pos2.y = pos2.y - minTD.y * (im2 / (im1 + im2))
 
-      floatingObject1.container.frame.position = pos1
-      floatingObject2.container.frame.position = pos2
+      if (floatingObject1.positionLocked === false) {
+        floatingObject1.container.frame.position = pos1
+      }
+      if (floatingObject2.positionLocked === false) {
+        floatingObject2.container.frame.position = pos2
+      }
     } catch (err) {
       if (ERROR_LOG === true) { logger.write('[ERROR] resolveCollision -> err= ' + err.stack) }
     }
diff --git a/FloatingSpace/FloatingObject.js b/FloatingSpace/FloatingObject.js
index 4db202c68..12d00d38f 100644
--- a/FloatingSpace/FloatingObject.js
+++ b/FloatingSpace/FloatingObject.js
@@ -290,4 +290,3 @@ function newFloatingObject () {
 
   }
 }
-
diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js
index e7feb426b..d4c1f9a10 100644
--- a/FloatingSpace/StrategyPart.js
+++ b/FloatingSpace/StrategyPart.js
@@ -291,9 +291,8 @@ function newStrategyPart () {
   }
 
   function drawBackground (pFloatingObject) {
-    if (isMouseOver === false) {
-      drawPartBackground(pFloatingObject)
-    }
+    drawPartBackground(pFloatingObject)
+
     thisObject.menu.drawBackground()
   }
 
@@ -303,10 +302,8 @@ function newStrategyPart () {
     /* Here we do the trick of recalculation the position of the anchor by setting it to the position of its parent */
     let parentFloatingObject = floatingLayer.getFloatingObject(pFloatingObject.payload.parentNode.handle)
 
-    if (isMouseOver === false) {
-      pFloatingObject.payload.profile.position.x = parentFloatingObject.container.frame.position.x
-      pFloatingObject.payload.profile.position.y = parentFloatingObject.container.frame.position.y
-    }
+    pFloatingObject.payload.profile.position.x = parentFloatingObject.container.frame.position.x
+    pFloatingObject.payload.profile.position.y = parentFloatingObject.container.frame.position.y
 
    /* Here I continue painting the background */