diff --git a/lib/awful.lua.in b/lib/awful.lua.in
index aad65f00..d2d9adce 100644
--- a/lib/awful.lua.in
+++ b/lib/awful.lua.in
@@ -1158,6 +1158,7 @@ end
 -- fg_focus The foreground color for selected tag.
 -- bg_urgent The background color for urgent tags.
 -- fg_urgent The foreground color for urgent tags.
+-- taglist_squares Optional: set "true" or nil to display the taglist squares.
 -- @return A string to print.
 function widget.taglist.label.all(t, args)
     if not args then args = {} end
@@ -1176,12 +1177,12 @@ function widget.taglist.label.all(t, args)
         fg_color = fg_focus
     end
     if sel and sel:tags()[t] then
-        if taglist_squares == nil or taglist_squares == true then
+        if not taglist_squares or taglist_squares == "true" then
             background = "resize=\"true\" image=\"@AWESOME_ICON_PATH@/taglist/squarefw.png\""
         end
     elseif bg_urgent and fg_urgent then
         for k, c in pairs(t:clients()) do
-            if taglist_squares == nil or taglist_squares == true then
+            if not taglist_squares or taglist_squares == "true" then
                 background = "resize=\"true\" image=\"@AWESOME_ICON_PATH@/taglist/squarew.png\""
             end
             if c.urgent then