diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt
index f576bc4..d0c6a08 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt
@@ -89,11 +89,11 @@ object IntentHelper {
         }
     }
 
-    fun getCalendarIntent(context: Context): Intent {
+    fun getCalendarIntent(context: Context, time: Long? = null): Intent {
         val calendarUri = CalendarContract.CONTENT_URI
             .buildUpon()
             .appendPath("time")
-            .appendPath(Calendar.getInstance().timeInMillis.toString())
+            .appendPath((time ?: Calendar.getInstance().timeInMillis).toString())
             .build()
         return when (Preferences.calendarAppPackage) {
             DEFAULT_OPTION -> {
@@ -177,7 +177,7 @@ object IntentHelper {
                 }
             }
             false -> {
-                getCalendarIntent(context)
+                getCalendarIntent(context, e.startDate)
             }
         }
     }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt
index b528a64..3b01f67 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt
@@ -227,11 +227,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
                     val pIntentDetail = PendingIntent.getActivity(
                         context,
                         widgetID,
-                        IntentHelper.getEventIntent(
-                            context,
-                            nextEvent,
-                            forceEventDetails = true
-                        ),
+                        IntentHelper.getCalendarIntent(context, nextEvent.startDate),
                         PendingIntent.FLAG_UPDATE_CURRENT
                     )
                     views.setOnClickPendingIntent(R.id.sub_line_rect, pIntentDetail)
@@ -563,18 +559,16 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
                         }
 
                     } else {
-                        val flags: Int =
-                            DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
                         val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate }
 
                         bindingView.subLineText.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get(
                                 Calendar.DAY_OF_YEAR)) {
-                            DateUtils.formatDateTime(context, nextEvent.startDate, flags)
+                            DateHelper.getDateText(context, start)
                         } else if (now.get(Calendar.DAY_OF_YEAR) > start.get(Calendar.DAY_OF_YEAR) || now.get(
                                 Calendar.YEAR) > start.get(Calendar.YEAR)) {
-                            DateUtils.formatDateTime(context, now.timeInMillis, flags)
+                            DateHelper.getDateText(context, now)
                         } else {
-                            DateUtils.formatDateTime(context, nextEvent.startDate, flags)
+                            DateHelper.getDateText(context, start)
                         }
                     }
                 }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
index 676d13e..556841f 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
@@ -253,11 +253,7 @@ class StandardWidget(val context: Context) {
                     val pIntentDetail = PendingIntent.getActivity(
                         context,
                         widgetID,
-                        IntentHelper.getEventIntent(
-                            context,
-                            nextEvent,
-                            forceEventDetails = true
-                        ),
+                        IntentHelper.getCalendarIntent(context, nextEvent.startDate),
                         PendingIntent.FLAG_UPDATE_CURRENT
                     )
                     views.setOnClickPendingIntent(R.id.sub_line_rect, pIntentDetail)
@@ -592,18 +588,16 @@ class StandardWidget(val context: Context) {
                         }
 
                     } else {
-                        val flags: Int =
-                            DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
                         val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate }
 
                         bindingView.subLineText.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get(
                                 Calendar.DAY_OF_YEAR)) {
-                            DateUtils.formatDateTime(context, nextEvent.startDate, flags)
+                            DateHelper.getDateText(context, start)
                         } else if (now.get(Calendar.DAY_OF_YEAR) > start.get(Calendar.DAY_OF_YEAR) || now.get(
                                 Calendar.YEAR) > start.get(Calendar.YEAR)) {
-                            DateUtils.formatDateTime(context, now.timeInMillis, flags)
+                            DateHelper.getDateText(context, now)
                         } else {
-                            DateUtils.formatDateTime(context, nextEvent.startDate, flags)
+                            DateHelper.getDateText(context, start)
                         }
                     }
                 }