diff --git a/rc.lua b/rc.lua
index e9a1037..02370cf 100644
--- a/rc.lua
+++ b/rc.lua
@@ -261,13 +261,15 @@ awful.screen.connect_for_each_screen(function(s)
     else -- portrait
      awful.tag(tags, s, awful.layout.suit.fair.horizontal)
     end
-    --[[
     awful.tag.attached_connect_signal(nil, "tagged", function(tag)
      for _,c in pairs(tag:clients()) do
-      c.titlebars_enabled = tag.layout == awful.layout.suit.floating
+      if tag.layout == awful.layout.suit.floating then
+       awful.titlebar.show(c)
+      else
+       awful.titlebar.hide(c)
+      end
      end
     end)
-    ]]
 
     -- Create a promptbox for each screen
     s.mypromptbox = awful.widget.prompt()