diff --git a/src/client.c b/src/client.c
index 48af1e8..b8e6e7b 100644
--- a/src/client.c
+++ b/src/client.c
@@ -919,6 +919,9 @@ client_maximize(Client *c)
 
      client_moveresize(c, c->geo, False);
 
+     /* Raise for maximized clients, client_raise has too much condition */
+     XRaiseWindow(dpy, c->frame);
+
      return;
 }
 
@@ -1210,7 +1213,7 @@ void
 client_raise(Client *c)
 {
      if(!c || !(c->flags & AboveFlag)
-           || ((c->flags & TileFlag) && !conf.client_tile_raise))
+               || ((c->flags & TileFlag) && (!conf.client_tile_raise)))
           return;
 
      XRaiseWindow(dpy, c->frame);
diff --git a/src/layout.c b/src/layout.c
index debbfc5..9f9ed13 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -748,7 +748,6 @@ uicb_togglemax(uicb_t cmd)
           sel->free_geo = sel->geo;
           sel->flags &= ~(TileFlag | FreeFlag);
           client_maximize(sel);
-          client_raise(sel);
           sel->flags |= MaxFlag;
      }
      else
diff --git a/wmfsrc b/wmfsrc
index 0ef3bf6..0f7d3c2 100644
--- a/wmfsrc
+++ b/wmfsrc
@@ -8,7 +8,7 @@
 
 [misc]
         font               = "dejavu-10"
-        raisefocus         = false
+        raisefocus         = true
         raiseswitch        = false
         focus_follow_mouse = true
         opacity            = 255