diff --git a/src/animation/client.h b/src/animation/client.h
index 67f4c10..9651316 100644
--- a/src/animation/client.h
+++ b/src/animation/client.h
@@ -240,7 +240,7 @@ void buffer_set_effect(Client *c, BufferData data) {
 	if (c == grabc)
 		data.should_scale = false;
 
-	if (c->isfullscreen || (no_radius_when_single && c->mon &&
+	if (c->isfullscreen || (no_radius_when_single && !c->isfloating && c->mon &&
 							c->mon->visible_tiling_clients == 1)) {
 		data.corner_location = CORNER_LOCATION_NONE;
 	}
@@ -265,7 +265,7 @@ void client_draw_shadow(Client *c) {
 
 	bool hit_no_border = check_hit_no_border(c);
 	enum corner_location current_corner_location =
-		c->isfullscreen || (no_radius_when_single && c->mon &&
+		c->isfullscreen || (no_radius_when_single && !c->isfloating && c->mon &&
 							c->mon->visible_tiling_clients == 1)
 			? CORNER_LOCATION_NONE
 			: CORNER_LOCATION_ALL;
@@ -355,7 +355,7 @@ void apply_border(Client *c) {
 
 	bool hit_no_border = check_hit_no_border(c);
 	enum corner_location current_corner_location =
-		c->isfullscreen || (no_radius_when_single && c->mon &&
+		c->isfullscreen || (no_radius_when_single && !c->isfloating && c->mon &&
 							c->mon->visible_tiling_clients == 1)
 			? CORNER_LOCATION_NONE
 			: CORNER_LOCATION_ALL;
diff --git a/src/fetch/client.h b/src/fetch/client.h
index ca39ab9..8543486 100644
--- a/src/fetch/client.h
+++ b/src/fetch/client.h
@@ -12,7 +12,8 @@ bool check_hit_no_border(Client *c) {
 		}
 	}
 
-	if (no_border_when_single && c && c->mon && c->mon->visible_clients == 1) {
+	if (no_border_when_single && c && !c->isfloating &&
+        c->mon && c->mon->visible_tiling_clients == 1) {
 		hit_no_border = true;
 	}
 	return hit_no_border;
@@ -402,4 +403,4 @@ float *get_border_color(Client *c) {
 	} else {
 		return bordercolor;
 	}
-}
\ No newline at end of file
+}