diff --git a/src/com/hlidskialf/android/pomodoro/Pomodoro.java b/src/com/hlidskialf/android/pomodoro/Pomodoro.java
index 188428b..bbff8c7 100644
--- a/src/com/hlidskialf/android/pomodoro/Pomodoro.java
+++ b/src/com/hlidskialf/android/pomodoro/Pomodoro.java
@@ -136,7 +136,7 @@ public static String format_time(long when)
     long left = when - System.currentTimeMillis();
     long min = Math.abs((long)(left / 60000));
     long sec = Math.abs((long)((left - min) / 1000) % 60);
-    return ((left < 0 ? "-" : "" )+ min+":"+sec);
+    return ((left < 0 ? "-" : "" ) + String.format("%02d", min) + ":" + String.format("%02d", sec));
   }
 
 
diff --git a/src/com/hlidskialf/android/widget/CountDownView.java b/src/com/hlidskialf/android/widget/CountDownView.java
index 2d8a033..bf8686e 100644
--- a/src/com/hlidskialf/android/widget/CountDownView.java
+++ b/src/com/hlidskialf/android/widget/CountDownView.java
@@ -43,7 +43,7 @@ public void start(long durationMillis, long startTime)
 
   public void stop()
   {
-    setText("0:0");
+    setText("00:00");
     mRunning = false;
   }
   public void pause()
@@ -61,6 +61,6 @@ protected void tick()
     long left = mUntil - System.currentTimeMillis();
     long min = Math.abs((long)(left / 60000));
     long sec = Math.abs((long)((left - min) / 1000) % 60);
-    setText((left < 0 ? "-" : "" )+ min+":"+sec);
+    setText((left < 0 ? "-" : "" ) + String.format("%02d", min) + ":" + String.format("%02d", sec));
   }
 }