diff --git a/packages/edit-post/src/components/header/post-publish-button-or-toggle.js b/packages/edit-post/src/components/header/post-publish-button-or-toggle.js
index 3e4d94d341ca36..70872667602c08 100644
--- a/packages/edit-post/src/components/header/post-publish-button-or-toggle.js
+++ b/packages/edit-post/src/components/header/post-publish-button-or-toggle.js
@@ -61,9 +61,9 @@ export function PostPublishButtonOrToggle( {
 		( isPending && ! hasPublishAction && ! isSmallerThanMediumViewport )
 	) {
 		component = IS_BUTTON;
-	} else if ( isSmallerThanMediumViewport ) {
+	} else if ( isSmallerThanMediumViewport && ! isPublishSidebarOpened ) {
 		component = IS_TOGGLE;
-	} else if ( isPublishSidebarEnabled ) {
+	} else if ( isPublishSidebarEnabled && ! isPublishSidebarOpened ) {
 		component = IS_TOGGLE;
 	} else {
 		component = IS_BUTTON;