diff --git a/packages/block-library/src/query/edit/inspector-controls/index.js b/packages/block-library/src/query/edit/inspector-controls/index.js
index fa4250d448c9a9..0ae4b052b57873 100644
--- a/packages/block-library/src/query/edit/inspector-controls/index.js
+++ b/packages/block-library/src/query/edit/inspector-controls/index.js
@@ -30,7 +30,6 @@ import StickyControl from './sticky-control';
 import PerPageControl from './per-page-control';
 import OffsetControl from './offset-controls';
 import PagesControl from './pages-control';
-import { unlock } from '../../../lock-unlock';
 import {
 	usePostTypes,
 	useIsPostTypeHierarchical,
@@ -174,22 +173,19 @@ export default function QueryInspectorControls( props ) {
 		showParentControl ||
 		showFormatControl;
 	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
+
 	const showPostCountControl = isControlAllowed(
 		allowedControls,
 		'postCount'
 	);
 	const showOffSetControl = isControlAllowed( allowedControls, 'offset' );
 	const showPagesControl = isControlAllowed( allowedControls, 'pages' );
+
 	const showDisplayPanel =
 		showPostCountControl || showOffSetControl || showPagesControl;
 
 	return (
 		<>
-			{ !! postType && (
-				<BlockInfo>
-					<CreateNewPostLink postType={ postType } />
-				</BlockInfo>
-			) }
 			{ showSettingsPanel && (
 				<PanelBody title={ __( 'Settings' ) }>
 					{ showInheritControl && (
diff --git a/packages/block-library/src/query/edit/query-toolbar.js b/packages/block-library/src/query/edit/query-toolbar.js
index 1e48a968e2bcd6..25e087ebe1559c 100644
--- a/packages/block-library/src/query/edit/query-toolbar.js
+++ b/packages/block-library/src/query/edit/query-toolbar.js
@@ -26,6 +26,7 @@ export default function QueryToolbar( { clientId, attributes } ) {
 				<Dropdown
 					contentClassName="block-editor-block-settings-menu__popover"
 					focusOnMount="firstElement"
+					expandOnMobile
 					renderToggle={ ( { isOpen, onToggle } ) => (
 						<ToolbarButton
 							aria-haspopup="true"
@@ -40,6 +41,7 @@ export default function QueryToolbar( { clientId, attributes } ) {
 							clientId={ clientId }
 							attributes={ attributes }
 							showSearch={ false }
+							showTitlesAsTooltip
 						/>
 					) }
 				/>
diff --git a/packages/block-library/src/query/editor.scss b/packages/block-library/src/query/editor.scss
index 57191afe7d5891..5bf0db81870403 100644
--- a/packages/block-library/src/query/editor.scss
+++ b/packages/block-library/src/query/editor.scss
@@ -62,5 +62,25 @@
 }
 
 .block-editor-block-settings-menu__popover {
-	min-width: 500px;
+	&.is-expanded {
+		overflow-y: scroll;
+	}
+	.block-library-query-pattern__selection-content {
+		height: 100%;
+	}
+	.block-editor-block-patterns-list {
+		display: grid;
+		grid-template-columns: 1fr;
+		@include break-small() {
+			grid-template-columns: 1fr 1fr;
+		}
+		grid-gap: $grid-unit-15;
+		min-width: $break-zoomed-in;
+		@include break-small() {
+			min-width: $break-mobile;
+		}
+	}
+	.block-editor-block-patterns-list__list-item {
+		margin-bottom: 0;
+	}
 }