diff --git a/lib/awful/tooltip.lua.in b/lib/awful/tooltip.lua.in
index 448661922..f28280475 100644
--- a/lib/awful/tooltip.lua.in
+++ b/lib/awful/tooltip.lua.in
@@ -82,6 +82,9 @@ local function set_geometry(self)
         self.wibox:geometry(n_s)
         place(self)
     end
+    if not self.wibox.visible then
+       place(self)
+    end
 end
 
 -- Show a tooltip.