diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9199c50d9..efc7f3c48 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 1.6.13
 - Fixed Interface with Crafting Upgrade being stuck if an earlier item configuration has missing items or fluids (raoulvdberge)
 - Added keybindings to open wireless items. The default one set to open a Wireless Grid is CTRL + G (raoulvdberge)
+- Added Grid quantity formatting for item counts over 1 billion (raoulvdberge)
 - Updated German translation (cydhra)
 - Updated Chinese translation (KoderX)
 - Fixed wrong item count for oredict patterns (the-eater)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java
index fc5407439..ec2f55fab 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/QuantityFormatter.java
@@ -25,7 +25,9 @@ public class QuantityFormatter implements IQuantityFormatter {
 
     @Override
     public String formatWithUnits(long qty) {
-        if (qty >= 1_000_000) {
+        if (qty >= 1_000_000_000) {
+            return formatterWithUnits.format(Math.round((float) qty / 1_000_000_000)) + "B";
+        } else if (qty >= 1_000_000) {
             float qtyShort = (float) qty / 1_000_000F;
 
             if (qty >= 100_000_000) {