diff --git a/init.lua b/init.lua
index 30395f9..a56ab01 100644
--- a/init.lua
+++ b/init.lua
@@ -775,7 +775,7 @@ local function new(config)
         end)
     end
 
-    client.connect_signal("manage", smart_border_titlebars)
+    client.connect_signal("request::tag", smart_border_titlebars)
 end
 
 return setmetatable(module, {