diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
index 6349c1e864..5cd5e918ab 100644
--- a/src/wp-admin/css/forms.css
+++ b/src/wp-admin/css/forms.css
@@ -1069,9 +1069,18 @@ table.form-table td .updated p {
 	vertical-align: middle;
 }
 
-.form-table.permalink-structure .available-structure-tags li {
-	float: left;
-	margin-right: 5px;
+.form-table.permalink-structure .available-structure-tag-buttons {
+	display: flex;
+	flex-wrap: wrap;
+	margin-top: 6px;
+}
+
+.form-table.permalink-structure button:not(:last-child) {
+	margin-right: 8px;
+}
+
+.form-table.permalink-structure button {
+	margin-top: 8px;
 }
 
 /*------------------------------------------------------------------------------
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index 87191625c7..3d2ae4a955 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -311,23 +311,21 @@ $structures = array(
 				if ( ! empty( $available_tags ) ) :
 					?>
 					<p><?php _e( 'Available tags:' ); ?></p>
-					<ul role="list">
+					<div class="available-structure-tag-buttons" role="list">
 						<?php
 						foreach ( $available_tags as $tag => $explanation ) {
 							?>
-							<li>
-								<button type="button"
-										class="button button-secondary"
-										aria-label="<?php echo esc_attr( sprintf( $explanation, $tag ) ); ?>"
-										data-added="<?php echo esc_attr( sprintf( $structure_tag_added, $tag ) ); ?>"
-										data-used="<?php echo esc_attr( sprintf( $structure_tag_already_used, $tag ) ); ?>">
-									<?php echo '%' . $tag . '%'; ?>
-								</button>
-							</li>
+							<button type="button"
+									class="button button-secondary"
+									aria-label="<?php echo esc_attr( sprintf( $explanation, $tag ) ); ?>"
+									data-added="<?php echo esc_attr( sprintf( $structure_tag_added, $tag ) ); ?>"
+									data-used="<?php echo esc_attr( sprintf( $structure_tag_already_used, $tag ) ); ?>">
+								<?php echo '%' . $tag . '%'; ?>
+							</button>
 							<?php
 						}
 						?>
-					</ul>
+					</div>
 				<?php endif; ?>
 			</div>
 		</td>