diff --git a/packages/block-editor/src/components/block-patterns-list/index.js b/packages/block-editor/src/components/block-patterns-list/index.js
index 9ab7bbaf0bb44..bebeb1f44184c 100644
--- a/packages/block-editor/src/components/block-patterns-list/index.js
+++ b/packages/block-editor/src/components/block-patterns-list/index.js
@@ -180,9 +180,7 @@ function BlockPatternList(
);
} ) }
- { pagingProps && pagingProps.numPages > 1 && (
-
- ) }
+ { pagingProps && }
);
}
diff --git a/packages/block-editor/src/components/block-patterns-paging/index.js b/packages/block-editor/src/components/block-patterns-paging/index.js
index 8900ac3808262..76f99e24bf244 100644
--- a/packages/block-editor/src/components/block-patterns-paging/index.js
+++ b/packages/block-editor/src/components/block-patterns-paging/index.js
@@ -27,66 +27,69 @@ export default function Pagination( {
)
}
-
-
-
-
-
-
- { sprintf(
- // translators: %1$s: Current page number, %2$s: Total number of pages.
- _x( '%1$s of %2$s', 'paging' ),
- currentPage,
- numPages
- ) }
-
+
+ { numPages > 1 && (
-
-
+
+ { sprintf(
+ // translators: %1$s: Current page number, %2$s: Total number of pages.
+ _x( '%1$s of %2$s', 'paging' ),
+ currentPage,
+ numPages
+ ) }
+
+
- »
-
+ changePage( currentPage + 1 ) }
+ disabled={ currentPage === numPages }
+ aria-label={ __( 'Next page' ) }
+ >
+ ›
+
+ changePage( numPages ) }
+ disabled={ currentPage === numPages }
+ aria-label={ __( 'Last page' ) }
+ size="default"
+ >
+ »
+
+
-
+ ) }
);
}
diff --git a/packages/block-editor/src/components/inserter/block-patterns-explorer/patterns-list.js b/packages/block-editor/src/components/inserter/block-patterns-explorer/patterns-list.js
index fcb9a1980db99..e34816393c8d3 100644
--- a/packages/block-editor/src/components/inserter/block-patterns-explorer/patterns-list.js
+++ b/packages/block-editor/src/components/inserter/block-patterns-explorer/patterns-list.js
@@ -135,15 +135,17 @@ function PatternList( { searchValue, selectedCategory, patternCategories } ) {
{ hasItems && (
-
- ) }
- { pagingProps.numPages > 1 && (
-
+ <>
+
+
+ >
) }
diff --git a/packages/block-editor/src/components/inserter/style.scss b/packages/block-editor/src/components/inserter/style.scss
index 2528139e8f30f..418990bfaf671 100644
--- a/packages/block-editor/src/components/inserter/style.scss
+++ b/packages/block-editor/src/components/inserter/style.scss
@@ -480,6 +480,7 @@ $block-inserter-tabs-height: 44px;
display: grid;
grid-gap: $grid-unit-40;
grid-template-columns: repeat(1, 1fr);
+ margin-bottom: $grid-unit-20;
@include break-xlarge() {
grid-template-columns: repeat(2, 1fr);