diff --git a/picard/util/__init__.py b/picard/util/__init__.py
index 8ffb9cd5b..6a5b5f20e 100644
--- a/picard/util/__init__.py
+++ b/picard/util/__init__.py
@@ -145,7 +145,7 @@ def format_time(ms):
     if ms == 0:
         return "?:??"
     else:
-        return "%d:%02d" % (ms / 60000, round((ms / 1000.0) % 60))
+        return "%d:%02d" % (round(ms / 1000.0) / 60, round(ms / 1000.0) % 60)
 
 def sanitize_date(datestr):
     """Sanitize date format.
diff --git a/test/test_utils.py b/test/test_utils.py
index c72d5456a..ae68c959e 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -100,3 +100,13 @@ class TranslateArtistTest(unittest.TestCase):
         self.failUnlessEqual(u"Pyotr Ilyich Tchaikovsky", util.translate_artist(u"Пётр Ильич Чайковский", u"Tchaikovsky, Pyotr Ilyich"))
         self.failIfEqual(u"Tchaikovsky, Pyotr Ilyich", util.translate_artist(u"Пётр Ильич Чайковский", u"Tchaikovsky, Pyotr Ilyich"))
         self.failIfEqual(u"Пётр Ильич Чайковский", util.translate_artist(u"Пётр Ильич Чайковский", u"Tchaikovsky, Pyotr Ilyich"))
+
+		
+class FormatTimeTest(unittest.TestCase):
+
+	def test(self):
+		self.failUnlessEqual("?:??", util.ormat_time(0))
+		self.failUnlessEqual("3:00", util.format_time(179750))
+		self.failUnlessEqual("3:00", util.format_time(179500))
+		self.failUnlessEqual("2:59", util.format_time(179499))
+		
\ No newline at end of file