diff --git a/client.c b/client.c
index 5d34c07..8ec8ffb 100644
--- a/client.c
+++ b/client.c
@@ -461,7 +461,7 @@ zoom(Arg *arg)
 {
 	Client *c;
 
-	if(!sel || (arrange != dotile) || sel->isfloat)
+	if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
 		return;
 
 	if(sel == getnext(clients))  {
diff --git a/event.c b/event.c
index 25ed6fa..650967e 100644
--- a/event.c
+++ b/event.c
@@ -132,8 +132,7 @@ buttonpress(XEvent *e)
 				movemouse(c);
 			break;
 		case Button2:
-			if(!c->ismax && arrange != dofloat && !c->isfloat)
-				zoom(NULL);
+			zoom(NULL);
 			break;
 		case Button3:
 			if(!c->ismax && (arrange == dofloat || c->isfloat))