diff --git a/mouse-click-effects@anaximeno/files/mouse-click-effects@anaximeno/5.4/mouseMovementTracker.js b/mouse-click-effects@anaximeno/files/mouse-click-effects@anaximeno/5.4/mouseMovementTracker.js
index e81ae57c..a3b95ee7 100644
--- a/mouse-click-effects@anaximeno/files/mouse-click-effects@anaximeno/5.4/mouseMovementTracker.js
+++ b/mouse-click-effects@anaximeno/files/mouse-click-effects@anaximeno/5.4/mouseMovementTracker.js
@@ -47,6 +47,7 @@ var MouseMovementTracker = class MouseMovementTracker {
         }
         if (params.icon) {
             Main.uiGroup.remove_child(this.icon_actor);
+            const [x, y, _] = global.get_pointer();
             this.icon_actor = new St.Icon({
                 reactive: false,
                 can_focus: false,
@@ -55,7 +56,10 @@ var MouseMovementTracker = class MouseMovementTracker {
                 opacity: this.opacity,
                 gicon: params.icon,
             });
+            this.move_to(x, y);
             Main.uiGroup.add_child(this.icon_actor);
+            if (!this.persist_on_stopped)
+                this.icon_actor.hide();
         }
         if (params.persist_on_stopped === true) {
             this.persist_on_stopped = params.persist_on_stopped;
@@ -69,9 +73,7 @@ var MouseMovementTracker = class MouseMovementTracker {
     finalize() {
         Main.uiGroup.remove_child(this.icon_actor);
         this.listener.remove();
-        this.listener = null;
         this.icon_actor.destroy();
-        this.icon_actor = null;
         global.log(UUID, "mouse movement tracker finalized");
     }
 
diff --git a/mouse-click-effects@anaximeno/files/mouse-click-effects@anaximeno/5.4/settings-schema.json b/mouse-click-effects@anaximeno/files/mouse-click-effects@anaximeno/5.4/settings-schema.json
index 0edd6622..cab53a89 100644
--- a/mouse-click-effects@anaximeno/files/mouse-click-effects@anaximeno/5.4/settings-schema.json
+++ b/mouse-click-effects@anaximeno/files/mouse-click-effects@anaximeno/5.4/settings-schema.json
@@ -192,19 +192,20 @@
 	"pause-animation-effects-enabled": {
 		"type": "switch",
 		"default": true,
-		"description": "Animate Effects Pause"
+		"description": "Animate Pause"
 	},
 	"mouse-movement-tracker-enabled": {
 		"type": "switch",
 		"default": false,
-		"description": "Mouse Movement Tracker"
+		"description": "Mouse Movement Tracker (experimental)",
+		"tooltip": "This is still experimental and may interfere when clicking on the panel or in some drag-and-drop operations."
 	},
 	"mouse-movement-tracker-persist-on-stopped-enabled": {
 		"type": "switch",
 		"default": false,
-		"description": "Persist Movement Tracker On Stopped",
-		"dependency": "mouse-movement-tracker-enabled"
-
+		"description": "Persist Movement Tracker On Stopped (experimental)",
+		"dependency": "mouse-movement-tracker-enabled",
+		"tooltip": "This is still experimental and may interfere when clicking on the panel or in some drag-and-drop operations."
 	},
 	"mouse-idle-watcher-enabled": {
 		"type": "switch",