diff --git a/AxonIvyPortal/portal/src_hd/com/axonivy/portal/component/NotificationFullPage/NotificationFullPage.xhtml b/AxonIvyPortal/portal/src_hd/com/axonivy/portal/component/NotificationFullPage/NotificationFullPage.xhtml
index 9b845e08f5..b8943e2ec8 100644
--- a/AxonIvyPortal/portal/src_hd/com/axonivy/portal/component/NotificationFullPage/NotificationFullPage.xhtml
+++ b/AxonIvyPortal/portal/src_hd/com/axonivy/portal/component/NotificationFullPage/NotificationFullPage.xhtml
@@ -50,14 +50,19 @@
                         <p:tooltip for="notification-mark-as-read"
                           value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/notifications/markAsRead')}" />
                       </div>
-                      <div class="flex notification-message-block flex-column">
-                        <p:commandLink id="notification-message" styleClass="notification-message"
-                          actionListener="#{notificationBean.goToTaskDetail(notification)}" rendered="#{notification.infoAction != null}">
-                        </p:commandLink>
-                        <h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
-                        <p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
-                        <h:outputText value="#{notification.timeSince}" styleClass="font-normal notifications-item-time-since" />
-                      </div>
+                       <div class="flex notification-message-block flex-column">
+                         <h:panelGroup rendered="#{notification.infoAction != null}">
+                           <p:commandLink id="notification-message" styleClass="notification-message"
+                              actionListener="#{notificationBean.goToNotificationDetail(notification, isWorkingOnATask, task)}">
+                              <h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
+                           </p:commandLink>
+                           <p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
+                         </h:panelGroup>
+                         <h:panelGroup rendered="#{notification.infoAction == null}">
+                            <h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
+                         </h:panelGroup>
+                         <h:outputText value="#{notification.timeSince}" styleClass="font-normal notifications-item-time-since" />
+                       </div>
                        <p:outputPanel rendered="#{notificationBean.isActionAvailible(notification)}" styleClass="flex notification-action-block">
                         <p:commandLink id="notification-start-task" styleClass="notification-start-task"
                           actionListener="#{notificationBean.startTask(notification)}" rendered="#{notification.runAction != null}">
diff --git a/AxonIvyPortal/portal/src_hd/com/axonivy/portal/dashboard/component/NotificationWidget/NotificationWidget.xhtml b/AxonIvyPortal/portal/src_hd/com/axonivy/portal/dashboard/component/NotificationWidget/NotificationWidget.xhtml
index 973a3d3eb8..6f9adc62ba 100644
--- a/AxonIvyPortal/portal/src_hd/com/axonivy/portal/dashboard/component/NotificationWidget/NotificationWidget.xhtml
+++ b/AxonIvyPortal/portal/src_hd/com/axonivy/portal/dashboard/component/NotificationWidget/NotificationWidget.xhtml
@@ -70,12 +70,17 @@
                       value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/notifications/markAsRead')}" />
                   </div>
                   <div class="flex notification-message-block flex-column">
-                      <p:commandLink id="notification-message" styleClass="notification-message" actionListener="#{widget.goToTaskDetail(notification)}"
-                         rendered="#{notification.infoAction != null}" disabled="#{!isReadOnlyMode}" >
+                    <h:panelGroup rendered="#{notification.infoAction != null}">
+                      <p:commandLink id="notification-message"
+                        styleClass="notification-message"
+                        actionListener="#{notificationBean.goToNotificationDetail(notification, isWorkingOnATask, task)}">
+                        <h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
                       </p:commandLink>
+                      <p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
+                    </h:panelGroup>
+                    <h:panelGroup rendered="#{notification.infoAction == null}">
                       <h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
-                      <p:tooltip for="notification-message" value="#{notification.infoAction.title}" /> 
-                    <p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
+                    </h:panelGroup>
                     <h:outputText value="#{notification.timeSince}" styleClass="font-normal notifications-item-time-since" />
                   </div>
                   <p:outputPanel rendered="#{notificationBean.isActionAvailible(notification)}" styleClass="flex notification-action-block">
diff --git a/AxonIvyPortal/portal/webContent/layouts/includes/notification.xhtml b/AxonIvyPortal/portal/webContent/layouts/includes/notification.xhtml
index 88e7d2224b..8bb65992ae 100644
--- a/AxonIvyPortal/portal/webContent/layouts/includes/notification.xhtml
+++ b/AxonIvyPortal/portal/webContent/layouts/includes/notification.xhtml
@@ -84,13 +84,17 @@
                               value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/notifications/markAsRead')}" />
                           </div>
                           <div class="flex notification-message-block flex-column">
-                            <p:commandLink id="notification-message" styleClass="notification-message"
-                              actionListener="#{notificationBean.goToNotificationDetail(notification, isWorkingOnATask, task)}"
-                              rendered="#{notification.infoAction != null}">
-                            </p:commandLink>
-                            <h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
+                            <h:panelGroup rendered="#{notification.infoAction != null}">
+                              <p:commandLink id="notification-message" styleClass="notification-message"
+                                actionListener="#{notificationBean.goToNotificationDetail(notification, isWorkingOnATask, task)}">
+                                <h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
+                              </p:commandLink>
                             <p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
-                            <h:outputText value="#{notification.timeSince}" styleClass="font-normal notifications-item-time-since" />
+                           </h:panelGroup>
+                           <h:panelGroup rendered="#{notification.infoAction == null}">
+                             <h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
+                           </h:panelGroup>
+                           <h:outputText value="#{notification.timeSince}" styleClass="font-normal notifications-item-time-since" />
                           </div>
                           <p:outputPanel rendered="#{notificationBean.isActionAvailible(notification)}" styleClass="flex notification-action-block">
                             <p:commandLink id="notification-start-task"