diff --git a/src/layout/arrange.h b/src/layout/arrange.h
index df703b85..4a441f14 100644
--- a/src/layout/arrange.h
+++ b/src/layout/arrange.h
@@ -20,7 +20,7 @@ void set_size_per(Monitor *m, Client *c) {
 		}
 	}
 
-	if (!found) {
+	if (!found || c->isfloating) {
 		c->master_mfact_per = m->pertag->mfacts[m->pertag->curtag];
 		c->master_inner_per = 1.0f;
 		c->stack_inner_per = 1.0f;
diff --git a/src/mango.c b/src/mango.c
index b7b131b9..ef680077 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -5684,6 +5684,7 @@ setfloating(Client *c, int32_t floating) {
 	}
 
 	if (c->isfloating) {
+		set_size_per(c->mon, c);
 		client_raise_group_tab_bar(c);
 	}