diff --git a/FloatingSpace/FloatingObject.js b/FloatingSpace/FloatingObject.js
index 553477a81..aedac3068 100644
--- a/FloatingSpace/FloatingObject.js
+++ b/FloatingSpace/FloatingObject.js
@@ -404,7 +404,7 @@ function newFloatingObject () {
 
       thisObject.positionLocked = true
 
-      canvas.floatingSpace.container.eventHandler.raiseEvent('onFocusAquired', thisObject.container)
+      canvas.floatingSpace.container.eventHandler.raiseEvent('onFocusAquired', thisObject)
       thisObject.isOnFocus = true
     }
   }
diff --git a/Spaces/FloatingSpace.js b/Spaces/FloatingSpace.js
index 2ae63bbf9..7664b7fc5 100644
--- a/Spaces/FloatingSpace.js
+++ b/Spaces/FloatingSpace.js
@@ -62,16 +62,12 @@ function newFloatingSpace () {
   const PERCENTAGE_OF_SCREEN_FOR_DISPLACEMENT = 25
   let onDragStartedEventSubscriptionId
   let spaceFocusAquiredEventSubscriptionId
-  let floatingObjetOnFocusEventSubscriptionId
 
   return thisObject
 
   function finalize () {
     thisObject.container.eventHandler.stopListening(onDragStartedEventSubscriptionId)
     canvas.floatingSpace.container.eventHandler.stopListening(spaceFocusAquiredEventSubscriptionId)
-    if (floatingObjetOnFocus !== undefined) {
-      floatingObjetOnFocus.eventHandler.stopListening(floatingObjetOnFocusEventSubscriptionId)
-    }
 
     thisObject.floatingLayer.finalize()
     thisObject.uiObjectConstructor.finalize()
@@ -100,18 +96,6 @@ function newFloatingSpace () {
       return
     }
     floatingObjetOnFocus = floatingObject
-    floatingObjetOnFocusEventSubscriptionId = floatingObjetOnFocus.container.eventHandler.listenToEvent('onNotFocus', onNotFocus)
-  }
-
-  function onNotFocus (container) {
-    if (container !== undefined) {
-      container.eventHandler.stopListening(floatingObjetOnFocusEventSubscriptionId)
-    }
-    if (floatingObjetOnFocus !== undefined) {
-      if (floatingObjetOnFocus.container.id === container.id) {
-        floatingObjetOnFocus = undefined
-      }
-    }
   }
 
   function toggleDrawReferenceLines () {