diff --git a/lib/awful/tag.lua b/lib/awful/tag.lua
index e0e09235..2c44f7f8 100644
--- a/lib/awful/tag.lua
+++ b/lib/awful/tag.lua
@@ -425,6 +425,8 @@ function tag.setlayout(layout, t)
         if instance.is_dynamic then
             data.dynamic_cache[t][layout] = instance
         end
+
+        layout = instance
     end
 
     tag.setproperty(t, "layout", layout, true)