diff --git a/user/config/awesome/rc.lua b/user/config/awesome/rc.lua
index d2f3ac6..7ee86d2 100644
--- a/user/config/awesome/rc.lua
+++ b/user/config/awesome/rc.lua
@@ -555,12 +555,16 @@ end)
 
 local function custommaximizedbutton(c)
   local widget = awful.titlebar.widget.button(c, "maximized", function(cl)
-    return cl.first_tag and awful.layout.get(cl.first_tag.screen) == awful.layout.suit.max
+    return not cl.floating and cl.first_tag and awful.layout.get(cl.first_tag.screen) == awful.layout.suit.max
   end, function(cl)
     if cl.floating then
       cl.floating = false
+      if awful.layout.get(cl.first_tag.screen) ~= awful.layout.suit.max then
+        change_layout()
+      end
+    else
+      change_layout()
     end
-    change_layout()
   end)
   local function update()
     if not c.valid then tag.disconnect_signal("property::layout", update)
@@ -613,6 +617,13 @@ end)
 client.connect_signal("mouse::enter", function(c)
     c:emit_signal("request::activate", "mouse_enter", {raise = false})
 end)
+client.connect_signal("property::floating", function(c)
+    if c.floating then
+        awful.titlebar(c, {bg = "#7d92c6"})
+    else
+        awful.titlebar(c, {bg = beautiful.titlebar_bg_normal})
+    end
+end)
 
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)