diff --git a/packages/apps/esm-help-menu-app/src/help-menu/components/contact-us.component.tsx b/packages/apps/esm-help-menu-app/src/help-menu/components/contact-us.component.tsx
index e7621594a..087340d6c 100644
--- a/packages/apps/esm-help-menu-app/src/help-menu/components/contact-us.component.tsx
+++ b/packages/apps/esm-help-menu-app/src/help-menu/components/contact-us.component.tsx
@@ -1,21 +1,16 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import styles from './styles.scss';
-import { ArrowUpRight } from '@carbon/react/icons';
-import { Link } from '@carbon/react';
+import { MenuItem } from '@carbon/react';
 
 const ContactUs = () => {
   const { t } = useTranslation();
   return (
-    <Link
+    <MenuItem
       className={styles.helpButton}
-      href="https://talk.openmrs.org"
-      rel="noopener noreferrer"
-      renderIcon={ArrowUpRight}
-      target="_blank"
-    >
-      {t('communityforum', 'Community forum')}
-    </Link>
+      label={t('communityforum', 'Community forum')}
+      onClick={() => window.open('https://talk.openmrs.org', '_blank')}
+    />
   );
 };
 
diff --git a/packages/apps/esm-help-menu-app/src/help-menu/components/docs.component.tsx b/packages/apps/esm-help-menu-app/src/help-menu/components/docs.component.tsx
index 7cc4e588b..376b6c6cb 100644
--- a/packages/apps/esm-help-menu-app/src/help-menu/components/docs.component.tsx
+++ b/packages/apps/esm-help-menu-app/src/help-menu/components/docs.component.tsx
@@ -1,21 +1,16 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import styles from './styles.scss';
-import { ArrowUpRight } from '@carbon/react/icons';
-import { Link } from '@carbon/react';
+import { MenuItem } from '@carbon/react';
 
 const Docs = () => {
   const { t } = useTranslation();
   return (
-    <Link
+    <MenuItem
       className={styles.helpButton}
-      href="https://o3-docs.openmrs.org"
-      rel="noopener noreferrer"
-      renderIcon={ArrowUpRight}
-      target="_blank"
-    >
-      {t('docs', 'Docs')}
-    </Link>
+      label={t('documentation', 'Documentation')}
+      onClick={() => window.open('https://o3-docs.openmrs.org', '_blank')}
+    />
   );
 };
 
diff --git a/packages/apps/esm-help-menu-app/src/help-menu/components/release-notes.component.tsx b/packages/apps/esm-help-menu-app/src/help-menu/components/release-notes.component.tsx
index ef8f6b45c..9609e2d89 100644
--- a/packages/apps/esm-help-menu-app/src/help-menu/components/release-notes.component.tsx
+++ b/packages/apps/esm-help-menu-app/src/help-menu/components/release-notes.component.tsx
@@ -1,22 +1,17 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import styles from './styles.scss';
-import { ArrowUpRight } from '@carbon/react/icons';
-import { Link } from '@carbon/react';
+import { MenuItem } from '@carbon/react';
 
 const ReleaseNotes = () => {
   const { t } = useTranslation();
 
   return (
-    <Link
+    <MenuItem
       className={styles.helpButton}
-      href="https://o3-docs.openmrs.org/docs/changelog"
-      rel="noopener noreferrer"
-      renderIcon={ArrowUpRight}
-      target="_blank"
-    >
-      {t('releaseNotes', 'Release notes')}
-    </Link>
+      label={t('releaseNotes', 'Release notes')}
+      onClick={() => window.open('https://o3-docs.openmrs.org/docs/changelog', '_blank')}
+    />
   );
 };
 
diff --git a/packages/apps/esm-help-menu-app/src/help-menu/components/styles.scss b/packages/apps/esm-help-menu-app/src/help-menu/components/styles.scss
index 803d7d3c3..8fb47c18d 100644
--- a/packages/apps/esm-help-menu-app/src/help-menu/components/styles.scss
+++ b/packages/apps/esm-help-menu-app/src/help-menu/components/styles.scss
@@ -3,9 +3,6 @@
 @import '~@openmrs/esm-styleguide/src/vars';
 
 .helpButton {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
   color: black !important;
   &:focus {
     outline: none;
diff --git a/packages/apps/esm-help-menu-app/src/help-menu/help-popup.styles.scss b/packages/apps/esm-help-menu-app/src/help-menu/help-popup.styles.scss
index c25dfc547..73a1373c6 100644
--- a/packages/apps/esm-help-menu-app/src/help-menu/help-popup.styles.scss
+++ b/packages/apps/esm-help-menu-app/src/help-menu/help-popup.styles.scss
@@ -7,7 +7,7 @@
   flex: auto;
   bottom: 2rem;
   right: 3rem;
-  width: 11rem;
+  width: 12rem;
   z-index: 8000;
   background-color: $ui-02;
   gap: spacing.$spacing-05;
diff --git a/packages/apps/esm-primary-navigation-app/src/components/change-language/change-language-link.extension.tsx b/packages/apps/esm-primary-navigation-app/src/components/change-language/change-language-link.extension.tsx
index 5afac0797..f309b5dd7 100644
--- a/packages/apps/esm-primary-navigation-app/src/components/change-language/change-language-link.extension.tsx
+++ b/packages/apps/esm-primary-navigation-app/src/components/change-language/change-language-link.extension.tsx
@@ -5,11 +5,16 @@ import { TranslateIcon, showModal, useSession } from '@openmrs/esm-framework';
 import styles from './change-language-link.scss';
 
 /** The user menu item that shows the current language and has a button to change the language */
-export function ChangeLanguageLink() {
+function ChangeLanguageLink() {
   const { t } = useTranslation();
   const session = useSession();
 
-  const launchChangeLanguageModal = useCallback(() => showModal('change-language-modal'), []);
+  const launchChangeLanguageModal = useCallback(() => {
+    const dispose = showModal('change-language-modal', {
+      closeModal: () => dispose(),
+      size: 'sm',
+    });
+  }, []);
 
   const languageNames = new Intl.DisplayNames([session?.locale], { type: 'language' });