diff --git a/workspace.lua b/workspace.lua
index 07bbb2a..8c5881e 100644
--- a/workspace.lua
+++ b/workspace.lua
@@ -144,6 +144,12 @@ function ws.new(name, args)
     end
     local tag = awful.tag.add(name, props)
 
+    tag:connect_signal("property::selected", function ()
+        if tag.volatile and not tag.selected and #tag:clients() == 0 then
+            tag:delete()
+        end
+    end)
+
     return handle_args(tag, args)
 end