diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 708e2b6eb0cc..1164e0592bfb 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , substituteAll
 , pkg-config
@@ -24,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-datetime";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-/kbwZVzOlC3ATCuXVMdf2RIskoGQKG1evaDYO3yFerg=";
+    sha256 = "sha256-GxlnzLDrZmDDAGlUMoM4k4SkbCqra3Th6ugRAj3Wse4=";
   };
 
   patches = [
@@ -38,12 +37,6 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       elementary_calendar = elementary-calendar;
     })
-    # Fix incorrect month shown on re-opening indicator if previously changed month
-    # https://github.com/elementary/wingpanel-indicator-datetime/pull/284
-    (fetchpatch {
-      url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch";
-      sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4=";
-    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch
index bec5f43e0d78..51c495362027 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch
@@ -1,8 +1,21 @@
+diff --git a/src/Indicator.vala b/src/Indicator.vala
+index 4aba03c..6385bc9 100644
+--- a/src/Indicator.vala
++++ b/src/Indicator.vala
+@@ -55,7 +55,7 @@ public class DateTime.Indicator : Wingpanel.Indicator {
+ 
+             panel_label.button_press_event.connect ((e) => {
+                 if (e.button == Gdk.BUTTON_MIDDLE) {
+-                    var command = "io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
++                    var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
+                     try {
+                         var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE);
+                         appinfo.launch_uris (null, null);
 diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala
-index 6e0d530a..2f90f96c 100644
+index cb54253..7477d1a 100644
 --- a/src/Widgets/calendar/CalendarView.vala
 +++ b/src/Widgets/calendar/CalendarView.vala
-@@ -222,7 +222,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
+@@ -242,7 +242,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
  
      // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app.
      public void show_date_in_maya (GLib.DateTime date) {