diff --git a/src/tools/cephfs/top/cephfs-top b/src/tools/cephfs/top/cephfs-top
index 1575d1706a0..9c581958324 100755
--- a/src/tools/cephfs/top/cephfs-top
+++ b/src/tools/cephfs/top/cephfs-top
@@ -108,7 +108,7 @@ def calc_perc(c):
 
 
 def calc_lat(c):
-    return round(c[0] + c[1] / 1000000000, 2)
+    return round(c[0] * 1000 + c[1] / 1000000, 2)
 
 
 def calc_stdev(c):
@@ -268,7 +268,7 @@ class FSTop(object):
         if typ == MetricType.METRIC_TYPE_PERCENTAGE:
             return "(%)"
         elif typ == MetricType.METRIC_TYPE_LATENCY:
-            return "(s)"
+            return "(ms)"
         elif typ == MetricType.METRIC_TYPE_SIZE:
             return "(MB)"
         elif typ == MetricType.METRIC_TYPE_STDEV: