diff --git a/gcal.go b/gcal.go
index 2c42e20..525f623 100644
--- a/gcal.go
+++ b/gcal.go
@@ -71,11 +71,18 @@ func (gcal *GCal) EventsToday(ctx context.Context) ([]Event, error) {
 			d = t2.Sub(t)
 		}
 
-		result = append(result, Event{
-			Name:     events.Items[i].Summary,
-			Time:     t,
-			Duration: d,
-		})
+		result = append(result,
+			Event{
+				Name:     "Soon: " + events.Items[i].Summary,
+				Time:     t.Add(-2 * time.Minute),
+				Duration: 0,
+			},
+			Event{
+				Name:     "Now: " + events.Items[i].Summary,
+				Time:     t,
+				Duration: d,
+			},
+		)
 	}
 	return result, nil
 }
diff --git a/main.go b/main.go
index 794de5b..4907e1e 100644
--- a/main.go
+++ b/main.go
@@ -122,16 +122,18 @@ func alertsGCal(ctx context.Context) (chan string, error) {
 				if err := refresh(); err != nil {
 					panic(err)
 				}
-			case <-time.After(time.Until(events[0].Time.Add(-2 * time.Minute))):
+			case <-time.After(time.Until(events[0].Time)):
 				select {
 				case <-ctx.Done():
 				case ch <- events[0].Name:
-					select {
-					case <-ctx.Done():
-					case <-time.After(events[0].Duration):
+					if events[0].Duration > 0 {
 						select {
 						case <-ctx.Done():
-						case ch <- "/" + events[0].Name:
+						case <-time.After(events[0].Duration):
+							select {
+							case <-ctx.Done():
+							case ch <- "/" + events[0].Name:
+							}
 						}
 					}
 				}