diff --git a/lib/awful.lua.in b/lib/awful.lua.in
index cf5e29b4..c17cf884 100644
--- a/lib/awful.lua.in
+++ b/lib/awful.lua.in
@@ -937,9 +937,12 @@ function P.widget.taglist.label.all(t, bg_focus, fg_focus, bg_urgent, fg_urgent)
         background = "resize=\"true\" image=\"@AWESOME_ICON_PATH@/taglist/squarefw.png\""
     elseif bg_urgent and fg_urgent then
         for k, c in pairs(client.get()) do
-            if c.urgent and c:istagged(t) then
-                bg_color = bg_urgent
-                fg_color = fg_urgent
+            if c:istagged(t) then
+                background = "resize=\"true\" image=\"@AWESOME_ICON_PATH@/taglist/squarew.png\""
+                if c.urgent then
+                    bg_color = bg_urgent
+                    fg_color = fg_urgent
+                end
             end
         end
     end