diff --git a/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx b/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx
index 1e5d60416..9efc44045 100644
--- a/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx
+++ b/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx
@@ -7,6 +7,7 @@ import WardPatientBedNumber from './row-elements/ward-patient-bed-number';
 import WardPatientName from './row-elements/ward-patient-name';
 import { WardPatientCardElement } from './ward-patient-card-element.component';
 import styles from './ward-patient-card.scss';
+import { launchPatientWorkspace, setWardPatient } from './ward-patient-resource';
 
 const WardPatientCard: WardPatientCard = (wardPatient) => {
   const { patient, bed } = wardPatient;
@@ -57,9 +58,8 @@ const WardPatientCard: WardPatientCard = (wardPatient) => {
       <button
         className={styles.wardPatientCardButton}
         onClick={() => {
-          launchWorkspace<WardPatientWorkspaceProps>('ward-patient-workspace', {
-            wardPatient,
-          });
+          setWardPatient(wardPatient);
+          launchPatientWorkspace();
         }}>
         {/* Name will not be displayed; just there for a11y */}
         {getPatientName(patient.person)}
diff --git a/packages/esm-ward-app/src/ward-patient-card/ward-patient-resource.ts b/packages/esm-ward-app/src/ward-patient-card/ward-patient-resource.ts
new file mode 100644
index 000000000..588c72af4
--- /dev/null
+++ b/packages/esm-ward-app/src/ward-patient-card/ward-patient-resource.ts
@@ -0,0 +1,15 @@
+import { launchWorkspace } from '@openmrs/esm-framework';
+import { type WardPatient, type WardPatientWorkspaceProps } from '../types';
+
+//To keep track of current patient when clicked on ward-patient-card and pass
+//it as a prop to launch workspace
+let wardPatient: WardPatient = null;
+export function setWardPatient(currentWardPatient: WardPatient) {
+  wardPatient = currentWardPatient;
+}
+
+export function launchPatientWorkspace() {
+  launchWorkspace<WardPatientWorkspaceProps>('ward-patient-workspace', {
+    wardPatient,
+  });
+}
diff --git a/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient-action-button.extension.tsx b/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient-action-button.extension.tsx
index 060c0bb57..be36c5403 100644
--- a/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient-action-button.extension.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient-action-button.extension.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { UserAvatarIcon } from '@openmrs/esm-framework';
 import { ActionMenuButton, launchWorkspace } from '@openmrs/esm-framework';
+import { launchPatientWorkspace } from '../../ward-patient-card/ward-patient-resource';
 
 export default function WardPatientActionButton() {
   const { t } = useTranslation();
@@ -11,7 +12,7 @@ export default function WardPatientActionButton() {
       getIcon={(props) => <UserAvatarIcon {...props} />}
       label={t('Patient', 'patient')}
       iconDescription={t('Patient', 'patient')}
-      handler={() => launchWorkspace('ward-patient-workspace')}
+      handler={() => launchPatientWorkspace()}
       type={'ward'}
     />
   );