diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt
index 8efb69e..c1a76f0 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt
@@ -20,14 +20,12 @@ import android.widget.RemoteViews
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.*
-import com.tommasoberlose.anotherwidget.helpers.WidgetHelper.reduceDimensionWithMaxWidth
 import com.tommasoberlose.anotherwidget.receivers.*
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.getCapWordString
@@ -264,13 +262,13 @@ class MainWidget : AppWidgetProvider() {
                     views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
                     views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
                 } else if (Preferences.showNextAlarm && nextAlarm != "") {
-                    val clockIntent = PendingIntent.getActivity(
+                    val alarmIntent = PendingIntent.getActivity(
                         context,
                         widgetID,
                         IntentHelper.getClockIntent(context),
                         0
                     )
-                    views.setOnClickPendingIntent(R.id.second_row_rect, clockIntent)
+                    views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
 
                     views.setImageViewBitmap(
                         R.id.next_event_rect,
@@ -285,6 +283,7 @@ class MainWidget : AppWidgetProvider() {
 
                     views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
                     views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
+                    views.setOnClickPendingIntent(R.id.next_event_rect, calPIntent)
                 } else if (MediaPlayerHelper.isSomeonePlaying(context)) {
                     val musicIntent = PendingIntent.getActivity(
                         context,
@@ -307,6 +306,7 @@ class MainWidget : AppWidgetProvider() {
 
                     views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
                     views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
+                    views.setOnClickPendingIntent(R.id.next_event_rect, calPIntent)
                 }
             } catch (ex: Exception) {
                 ex.printStackTrace()
diff --git a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 7d6a280..7bbaa8e 100644
--- a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Fri May 08 15:03:49 CEST 2020
+#Fri May 08 15:14:56 CEST 2020
 base.0=/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/intermediates/dex/debug/mergeProjectDexDebug/out/classes.dex
 path.0=classes.dex
 renamed.0=classes.dex