diff --git a/sway/layout.c b/sway/layout.c
index ba9a8864..6502d930 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -579,9 +579,7 @@ void update_geometry(swayc_t *container) {
 					border_left = 0;
 				}
 
-				if (geometry.origin.x + geometry.size.w == size.w ||
-						geometry.size.w == container->x + container->width) {
-					// should work for swaybar at right
+				if (geometry.origin.x + geometry.size.w == workspace->x + workspace->width) {
 					border_right = 0;
 				}
 			}
@@ -591,9 +589,7 @@ void update_geometry(swayc_t *container) {
 					border_top = 0;
 				}
 
-				if (geometry.origin.y + geometry.size.h == size.h ||
-						geometry.size.h == container->y + container->height) {
-					// this works for swaybar at bottom
+				if (geometry.origin.y + geometry.size.h == workspace->y + workspace->height) {
 					border_bottom = 0;
 				}
 			}