diff --git a/include/fmt/format.h b/include/fmt/format.h
index dab193685ba9..9cb73c3814a2 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -1962,11 +1962,12 @@ OutputIt write_float(OutputIt out, const DecimalFP& fp,
       fspecs.precision < num_zeros) {
     num_zeros = fspecs.precision;
   }
-  size += 2 + to_unsigned(num_zeros);
+  bool pointy = num_zeros != 0 || significand_size != 0 || fspecs.showpoint;
+  size += 1 + (pointy ? 1 : 0) + to_unsigned(num_zeros);
   return write_padded<align::right>(out, specs, size, [&](iterator it) {
     if (sign) *it++ = static_cast<Char>(data::signs[sign]);
     *it++ = zero;
-    if (num_zeros == 0 && significand_size == 0 && !fspecs.showpoint) return it;
+    if (!pointy) return it;
     *it++ = decimal_point;
     it = detail::fill_n(it, num_zeros, zero);
     return write_significand<Char>(it, significand, significand_size);
diff --git a/test/format-test.cc b/test/format-test.cc
index 860cdf69e1fd..74743e7a40a5 100644
--- a/test/format-test.cc
+++ b/test/format-test.cc
@@ -871,6 +871,7 @@ TEST(FormatterTest, Width) {
   EXPECT_EQ(format("{:*^5}", "🤡"), "**🤡**");
   EXPECT_EQ(format("{:#6}", 42.0), "  42.0");
   EXPECT_EQ(format("{:6c}", static_cast<int>('x')), "x     ");
+  EXPECT_EQ(format("{:>06.0f}", 0.00884311), "000000");
 }
 
 template <typename T> inline T const_check(T value) { return value; }