diff --git a/src/uosc/lib/cursor.lua b/src/uosc/lib/cursor.lua
index d576c63b..b255de98 100644
--- a/src/uosc/lib/cursor.lua
+++ b/src/uosc/lib/cursor.lua
@@ -227,8 +227,6 @@ function cursor:move(x, y)
 			Elements:update_proximities()
 			Elements:trigger('global_mouse_leave')
 		else
-			Elements:update_proximities()
-
 			if self.hidden then
 				-- Cancel potential fadeouts
 				for _, id in ipairs(config.cursor_leave_fadeout_elements) do
@@ -236,12 +234,12 @@ function cursor:move(x, y)
 				end
 
 				self.hidden = false
-				self.history:clear()
 				Elements:trigger('global_mouse_enter')
-			else
-				-- Update history
-				self.history:insert({x = self.x, y = self.y, time = mp.get_time()})
 			end
+
+			Elements:update_proximities()
+			-- Update history
+			self.history:insert({x = self.x, y = self.y, time = mp.get_time()})
 		end
 
 		Elements:proximity_trigger('mouse_move')