diff --git a/lib/awful/mouse/finder.lua.in b/lib/awful/mouse/finder.lua.in
index 32c9b52c4..d1d61fb1f 100644
--- a/lib/awful/mouse/finder.lua.in
+++ b/lib/awful/mouse/finder.lua.in
@@ -77,8 +77,6 @@ local function show(self)
     -- do nothing if the mouse finder is already shown
     if data[self].wibox.visible then return end
     if not data[self].timer.started then
-        -- make sure the mouse finder is on the same screen as the mouse
-        data[self].wibox.screen = mouse.screen
         data[self].wibox:geometry({width = data[self].radius, height = data[self].radius })
         a_wibox.rounded_corners(data[self].wibox, data[self].radius/2 -1)
         data[self].timer:start()
diff --git a/lib/awful/tooltip.lua.in b/lib/awful/tooltip.lua.in
index 92dad35bb..49b0b7be1 100644
--- a/lib/awful/tooltip.lua.in
+++ b/lib/awful/tooltip.lua.in
@@ -92,8 +92,6 @@ end
 local function show(self)
     -- do nothing if the tooltip is already shown
     if self.visible then return end
-    -- make sure the tooltip is on the same screen as the mouse
-    self.wibox.screen = mouse.screen
     if data[self].timer then
         if not data[self].timer.started then
             data[self].timer_function()