diff --git a/blocks/library/block/index.js b/blocks/library/block/index.js
index 717addd73c76d8..41be2c07b9c2d0 100644
--- a/blocks/library/block/index.js
+++ b/blocks/library/block/index.js
@@ -40,15 +40,6 @@ class ReusableBlockEdit extends Component {
 		}
 	}
 
-	/**
-	 * @inheritdoc
-	 */
-	componentWillReceiveProps( nextProps ) {
-		if ( this.props.focus && ! nextProps.focus ) {
-			this.stopEditing();
-		}
-	}
-
 	startEditing() {
 		this.setState( { isEditing: true } );
 	}
@@ -117,7 +108,7 @@ class ReusableBlockEdit extends Component {
 		return (
 			<Fragment>
 				{ element }
-				{ isSelected && (
+				{ ( isSelected || isEditing ) && (
 					<ReusableBlockEditPanel
 						key="panel"
 						isEditing={ isEditing }