diff --git a/packages/js/src/components/SEMrushRelatedKeyphrasesModal.js b/packages/js/src/components/SEMrushRelatedKeyphrasesModal.js
index 91369e42d81..80c113dc08c 100644
--- a/packages/js/src/components/SEMrushRelatedKeyphrasesModal.js
+++ b/packages/js/src/components/SEMrushRelatedKeyphrasesModal.js
@@ -153,7 +153,7 @@ class SEMrushRelatedKeyphrasesModal extends Component {
 	 * @returns {wp.Element} The RelatedKeyPhrasesModal modal component.
 	 */
 	render() {
-		const { keyphrase, location, whichModalOpen, isLoggedIn, shouldCloseOnClickOutside, onClose, countryCode, isRtl } = this.props;
+		const { keyphrase, location, whichModalOpen, isLoggedIn, onClose, countryCode, isRtl } = this.props;
 
 		const insightsLink = "https://www.semrush.com/analytics/keywordoverview/?q=" + encodeURIComponent( keyphrase ) +
 			"&db=" + encodeURIComponent( countryCode );
@@ -169,16 +169,16 @@ class SEMrushRelatedKeyphrasesModal extends Component {
 						{ __( "Get related keyphrases", "wordpress-seo" ) }
 					</NewButton>
 				</div> }
-				<Root context={{ isRtl }} >
+				<Root context={ { isRtl } }>
 					<Modal
-						isOpen={ keyphrase && whichModalOpen === location }
+						isOpen={ Boolean( keyphrase ) && whichModalOpen === location }
 						onClose={ onClose }
 						insightsLink={ insightsLink }
 						learnMoreLink={ "https://learnmore.semrush.com/" }
 					>
-					
+
 						<Slot name="YoastRelatedKeyphrases" />
-			
+
 					</Modal>
 				</Root>
 				{ ! isLoggedIn && <div className={ "yoast" }>
@@ -217,7 +217,7 @@ SEMrushRelatedKeyphrasesModal.propTypes = {
 	onOpenWithNoKeyphrase: PropTypes.func.isRequired,
 	onClose: PropTypes.func.isRequired,
 	onAuthentication: PropTypes.func.isRequired,
-	shouldCloseOnClickOutside: PropTypes.bool,
+	countryCode: PropTypes.string,
 	isRtl: PropTypes.bool,
 };
 
@@ -226,7 +226,7 @@ SEMrushRelatedKeyphrasesModal.defaultProps = {
 	location: "",
 	whichModalOpen: "none",
 	isLoggedIn: false,
-	shouldCloseOnClickOutside: true,
+	countryCode: "en_US",
 	isRtl: false,
 };
 
diff --git a/packages/js/src/containers/SEMrushRelatedKeyphrases.js b/packages/js/src/containers/SEMrushRelatedKeyphrases.js
index 08905d26079..3c1d43496b9 100644
--- a/packages/js/src/containers/SEMrushRelatedKeyphrases.js
+++ b/packages/js/src/containers/SEMrushRelatedKeyphrases.js
@@ -27,7 +27,7 @@ export default compose( [
 			isPending: getSEMrushIsRequestPending(),
 			requestHasData: getSEMrushRequestHasData(),
 			lastRequestKeyphrase: getSEMrushRequestKeyphrase(),
-			
+
 		};
 	} ),
 	withDispatch( ( dispatch ) => {
diff --git a/packages/js/src/containers/SEMrushRelatedKeyphrasesModal.js b/packages/js/src/containers/SEMrushRelatedKeyphrasesModal.js
index d8ae469f020..525b32f7727 100644
--- a/packages/js/src/containers/SEMrushRelatedKeyphrasesModal.js
+++ b/packages/js/src/containers/SEMrushRelatedKeyphrasesModal.js
@@ -7,7 +7,6 @@ export default compose( [
 		const {
 			getSEMrushModalOpen,
 			getSEMrushLoginStatus,
-			getIsElementorEditor,
 			getSEMrushSelectedCountry,
 			getPreference,
 		} = select( "yoast-seo/editor" );
@@ -15,7 +14,6 @@ export default compose( [
 		return {
 			whichModalOpen: getSEMrushModalOpen(),
 			isLoggedIn: getSEMrushLoginStatus(),
-			shouldCloseOnClickOutside: ! getIsElementorEditor(),
 			countryCode: getSEMrushSelectedCountry(),
 			isRtl: getPreference( "isRtl", false ),
 		};