diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix
index 506b082..8c014df 100644
--- a/home-modules/waybar.nix
+++ b/home-modules/waybar.nix
@@ -153,12 +153,14 @@ if __name__ == "__main__":
 
     hours, rem = divmod(int(t), 3600)
     minutes, _ = divmod(rem, 60)
-    hour_string = f"{hours} hour{'s ' if hours != 1 else ' '}and " if hours > 0 else ""
+    hour_string = f"{hours} hour{'s ' if hours != 1 else ' '}" if hours > 0 else ""
     minu_string = f"{minutes} minute{'s ' if minutes != 1 else ' '}" if minutes > 0 else ""
     if hour_string == "" and minu_string == "":
         time_string = "now"
-    else:
+    elif hour_string == "" or minu_string == "":
         time_string = "in " + hour_string + minu_string
+    else:
+        time_string = "in " + hour_string + "and " + minu_string
 
     print(f"{event_dict['event_name']} {action_string} {time_string}")
 '')