diff --git a/lib/awful/widget/taglist.lua.in b/lib/awful/widget/taglist.lua.in
index b3aceb49e..5cafa299c 100644
--- a/lib/awful/widget/taglist.lua.in
+++ b/lib/awful/widget/taglist.lua.in
@@ -128,7 +128,7 @@ function label.all(t, args)
         bg_color = bg_focus
         fg_color = fg_focus
     end
-    if sel then
+    if sel and sel.type ~= "desktop" then
         if taglist_squares_sel then
             -- Check that the selected clients is tagged with 't'.
             local seltags = sel:tags()
diff --git a/tag.c b/tag.c
index e8a98f939..ad8aca4ba 100644
--- a/tag.c
+++ b/tag.c
@@ -397,6 +397,8 @@ luaA_tag_clients(lua_State *L)
     lua_createtable(L, clients->len, 0);
     for(i = 0; i < clients->len; i++)
     {
+        if(clients->tab[i]->type == WINDOW_TYPE_DESKTOP)
+            continue;
         luaA_object_push(L, clients->tab[i]);
         lua_rawseti(L, -2, i + 1);
     }