diff --git a/lib/awful.lua.in b/lib/awful.lua.in
index 1292d9c0..58c5f937 100644
--- a/lib/awful.lua.in
+++ b/lib/awful.lua.in
@@ -569,7 +569,7 @@ function client.toggletag(target, c)
     if sel and sel.screen == target.screen then
         local tags = sel:tags()
         if tags[target] then
-            tags[target] = nil
+            tags[tags[target]] = nil
         else
             tags[target] = target
         end