diff --git a/decor/eta.go b/decor/eta.go
index a85224c..44a1f03 100644
--- a/decor/eta.go
+++ b/decor/eta.go
@@ -74,7 +74,11 @@
 	case ET_STYLE_HHMM:
 		str = fmt.Sprintf("%02d:%02d", hours, minutes)
 	case ET_STYLE_MMSS:
-		str = fmt.Sprintf("%02d:%02d", minutes, seconds)
+		if hours > 0 {
+			str = fmt.Sprintf("%02d:%02d:%02d", hours, minutes, seconds)
+		} else {
+			str = fmt.Sprintf("%02d:%02d", minutes, seconds)
+		}
 	}
 
 	return d.FormatMsg(str)
@@ -146,7 +150,11 @@
 	case ET_STYLE_HHMM:
 		str = fmt.Sprintf("%02d:%02d", hours, minutes)
 	case ET_STYLE_MMSS:
-		str = fmt.Sprintf("%02d:%02d", minutes, seconds)
+		if hours > 0 {
+			str = fmt.Sprintf("%02d:%02d:%02d", hours, minutes, seconds)
+		} else {
+			str = fmt.Sprintf("%02d:%02d", minutes, seconds)
+		}
 	}
 
 	return d.FormatMsg(str)