diff --git a/lib/awful.lua.in b/lib/awful.lua.in
index ef11a1fd..d20751c5 100644
--- a/lib/awful.lua.in
+++ b/lib/awful.lua.in
@@ -1600,6 +1600,7 @@ function widget.button(args)
     local img_press = "<bg_margin top=\"2\" left=\"2\"/><bg image=\"" .. args.image .. "\" resize=\"true\"/>"
     w.text = img_release
     w:buttons({ capi.button({}, 1, function () w.text = img_press end, function () w.text = img_release end) })
+    function w.mouse_leave(s) w.text = img_release end
     return w
 end