diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
index 40c5e0903e..5a9cb7224c 100644
--- a/src/wp-admin/css/forms.css
+++ b/src/wp-admin/css/forms.css
@@ -1082,9 +1082,18 @@ table.form-table td .updated p {
 	margin-top: 8px;
 }
 
+.form-table.permalink-structure .available-structure-tags ul {
+	display: flex;
+	flex-wrap: wrap;
+	margin: 8px 0 0;
+}
+
 .form-table.permalink-structure .available-structure-tags li {
-	float: left;
-	margin-right: 5px;
+	margin: 6px 5px 0 0;
+}
+
+.form-table.permalink-structure .available-structure-tags li:last-child {
+	margin-right: 0;
 }
 
 .form-table.permalink-structure .structure-selection .row {