diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
index 25a23d3..38606ae 100644
--- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
+++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
@@ -325,7 +325,7 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
             true
         }
 
-        binding.clockLayout.setOnClickListener {_ ->
+        clock.setOnClickListener {_ ->
             if (sharedPreferenceManager.isClockGestureEnabled()) {
                 val intent = Intent(AlarmClock.ACTION_SHOW_ALARMS)
                 if (intent.resolveActivity(packageManager) != null) {
@@ -334,7 +334,25 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
             }
         }
 
-        binding.clockLayout.setOnLongClickListener {_ ->
+        dateText.setOnClickListener { _ ->
+            if (sharedPreferenceManager.isDateGestureEnabled()) {
+                startActivity(
+                    Intent(
+                        Intent.makeMainSelectorActivity(
+                            Intent.ACTION_MAIN,
+                            Intent.CATEGORY_APP_CALENDAR
+                        )
+                    )
+                )
+            }
+        }
+
+        clock.setOnLongClickListener {_ ->
+            startActivity(Intent(this@MainActivity, SettingsActivity::class.java))
+            true
+        }
+
+        dateText.setOnLongClickListener {_ ->
             startActivity(Intent(this@MainActivity, SettingsActivity::class.java))
             true
         }
diff --git a/app/src/main/java/eu/ottop/yamlauncher/settings/SharedPreferenceManager.kt b/app/src/main/java/eu/ottop/yamlauncher/settings/SharedPreferenceManager.kt
index 84b8eb9..45b5da7 100644
--- a/app/src/main/java/eu/ottop/yamlauncher/settings/SharedPreferenceManager.kt
+++ b/app/src/main/java/eu/ottop/yamlauncher/settings/SharedPreferenceManager.kt
@@ -131,6 +131,10 @@ class SharedPreferenceManager (private val context: Context) {
         return preferences.getBoolean("clockClick", true)
     }
 
+    fun isDateGestureEnabled() : Boolean {
+        return preferences.getBoolean("dateClick", true)
+    }
+
     // Gestures
     fun setGestures(direction: String, appName: String?) {
         val editor = preferences.edit()
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index df194cc..87e5623 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -182,6 +182,12 @@
             android:defaultValue="true"
             android:title="Clicking Time Opens Clock"
             app:key="clockClick" />
+        <SwitchPreference
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:defaultValue="true"
+            android:title="Clicking Date Opens Calendar"
+            app:key="dateClick" />
         <SwitchPreference
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"