diff --git a/static/includes/_cells.scss b/static/includes/_cells.scss
index 8a5ce206..58e85d71 100644
--- a/static/includes/_cells.scss
+++ b/static/includes/_cells.scss
@@ -72,8 +72,11 @@ div.block {
 	background: $cell-background;
 	color: $cell-color;
 	box-sizing: border-box;
-	border-radius: $border-radius;
 	border: $cell-border;
+	@if $cell-border-radius {
+		border-radius: $cell-border-radius;
+		overflow: hidden;
+	}
 }
 
 div#services > ul > li,
@@ -203,19 +206,6 @@ div.wcscurrentformscell ul {
 		text-align: center;
 	}
 
-	// make sure first/last children don't overflow the cell radius
-	> li:first-child a {
-		border-top-left-radius: $cell-border-radius;
-		border-top-right-radius: $cell-border-radius;
-	}
-	> li:last-child a {
-		border-bottom-left-radius: $cell-border-radius;
-		border-bottom-right-radius: $cell-border-radius;
-	}
-	ul > li:first-child a, ul > li:last-child a {
-		border-radius: 0;
-	}
-
 	li div.description {
 		position: relative;
 		top: -1px;