From 1a6c46d1d1bacbc1b569f9a01eeedb9aff574f7d Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 20 Apr 2018 09:35:08 +0100
Subject: [PATCH] Mobile: Fix toolbar position

---
 edit-post/components/header/header-toolbar/index.js | 2 +-
 editor/components/block-list/block.js               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/edit-post/components/header/header-toolbar/index.js b/edit-post/components/header/header-toolbar/index.js
index 452656debf3623..c03d52387ff405 100644
--- a/edit-post/components/header/header-toolbar/index.js
+++ b/edit-post/components/header/header-toolbar/index.js
@@ -35,7 +35,7 @@ function HeaderToolbar( { hasFixedToolbar, isLargeViewport } ) {
 			<EditorHistoryRedo />
 			<TableOfContents />
 			<MultiBlocksSwitcher />
-			{ hasFixedToolbar && isLargeViewport && (
+			{ ( hasFixedToolbar || ! isLargeViewport ) && (
 				<div className="edit-post-header-toolbar__block-toolbar">
 					<BlockToolbar />
 				</div>
diff --git a/editor/components/block-list/block.js b/editor/components/block-list/block.js
index 7d5da4e893d4b3..a5d4e9c0827cc5 100644
--- a/editor/components/block-list/block.js
+++ b/editor/components/block-list/block.js
@@ -429,7 +429,7 @@ export class BlockListBlock extends Component {
 		const shouldRenderMovers = ( isSelected || hoverArea === 'left' ) && ! showSideInserter && ! isMultiSelecting && ! isMultiSelected;
 		const shouldRenderBlockSettings = ( isSelected || hoverArea === 'right' ) && ! showSideInserter && ! isMultiSelecting && ! isMultiSelected;
 		const shouldShowBreadcrumb = isHovered;
-		const shouldShowContextualToolbar = shouldAppearSelected && isValid && ( ! hasFixedToolbar || ! isLargeViewport );
+		const shouldShowContextualToolbar = shouldAppearSelected && isValid && ( ! hasFixedToolbar && isLargeViewport );
 		const shouldShowMobileToolbar = shouldAppearSelected;
 		const { error, dragging } = this.state;