diff --git a/epictrack-web/src/components/myWorkplans/Card/CardBody.tsx b/epictrack-web/src/components/myWorkplans/Card/CardBody.tsx
index c0e40ed78..622f09e33 100644
--- a/epictrack-web/src/components/myWorkplans/Card/CardBody.tsx
+++ b/epictrack-web/src/components/myWorkplans/Card/CardBody.tsx
@@ -47,15 +47,14 @@ const CardBody = ({ workplan }: CardProps) => {
             bold
             color={Palette.neutral.dark}
             xs
+            enableTooltip
+            enableEllipsis
+            tooltip={workTitle}
             sx={{
-              overflow: "hidden",
-              textOverflow: "ellipsis",
-              whiteSpace: "nowrap",
+              maxWidth: "70%",
             }}
           >
-            <Tooltip title={workTitle} placement="top-start">
-              <span>{workTitle}</span>
-            </Tooltip>
+            {workTitle}
           </ETHeading4>
         </Grid>
         <Grid item xs={3} container justifyContent={"flex-end"}>
diff --git a/epictrack-web/src/components/shared/index.tsx b/epictrack-web/src/components/shared/index.tsx
index ca309d29b..85bb3e774 100644
--- a/epictrack-web/src/components/shared/index.tsx
+++ b/epictrack-web/src/components/shared/index.tsx
@@ -130,20 +130,26 @@ export const ETHeading4 = ({
   ...rest
 }: HeaderProps) => {
   return (
-    <Typography
-      color={color}
-      sx={{
-        ...sx,
-        fontWeight: bold
-          ? MET_Header_Font_Weight_Bold
-          : MET_Header_Font_Weight_Regular,
-        fontFamily: MET_Header_Font_Family,
-      }}
-      variant="h4"
-      {...rest}
+    <Tooltip
+      title={rest.tooltip as string}
+      disableHoverListener={!rest.enableTooltip}
     >
-      {children}
-    </Typography>
+      <Typography
+        color={color}
+        sx={{
+          ...sx,
+          fontWeight: bold
+            ? MET_Header_Font_Weight_Bold
+            : MET_Header_Font_Weight_Regular,
+          fontFamily: MET_Header_Font_Family,
+          ...(rest.enableEllipsis && useStyle.textEllipsis),
+        }}
+        variant="h4"
+        {...rest}
+      >
+        {children}
+      </Typography>
+    </Tooltip>
   );
 };