diff --git a/modules/juce_gui_basics/layout/juce_Grid.cpp b/modules/juce_gui_basics/layout/juce_Grid.cpp
index eb43a99b6d..a681121a6d 100644
--- a/modules/juce_gui_basics/layout/juce_Grid.cpp
+++ b/modules/juce_gui_basics/layout/juce_Grid.cpp
@@ -920,10 +920,10 @@ struct Grid::BoxAlignment
 
         if (item.width     != (float) GridItem::notAssigned)  r.setWidth  (item.width);
         if (item.height    != (float) GridItem::notAssigned)  r.setHeight (item.height);
-        if (item.maxWidth  != GridItem::notAssigned)          r.setWidth  (jmin (item.maxWidth,  r.getWidth()));
-        if (item.minWidth  != GridItem::notAssigned)          r.setWidth  (jmax (item.minWidth,  r.getWidth()));
-        if (item.maxHeight != GridItem::notAssigned)          r.setHeight (jmin (item.maxHeight, r.getHeight()));
-        if (item.minHeight != GridItem::notAssigned)          r.setHeight (jmax (item.minHeight, r.getHeight()));
+        if (item.maxWidth  != (float) GridItem::notAssigned)  r.setWidth  (jmin (item.maxWidth,  r.getWidth()));
+        if (item.minWidth  > 0.0f)                            r.setWidth  (jmax (item.minWidth,  r.getWidth()));
+        if (item.maxHeight != (float) GridItem::notAssigned)  r.setHeight (jmin (item.maxHeight, r.getHeight()));
+        if (item.minHeight > 0.0f)                            r.setHeight (jmax (item.minHeight, r.getHeight()));
 
         if (alignType == Grid::AlignItems::start && justifyType == Grid::JustifyItems::start)
             return r;
diff --git a/modules/juce_gui_basics/layout/juce_GridItem.h b/modules/juce_gui_basics/layout/juce_GridItem.h
index 30f95c6e32..3139e3f4ac 100644
--- a/modules/juce_gui_basics/layout/juce_GridItem.h
+++ b/modules/juce_gui_basics/layout/juce_GridItem.h
@@ -174,12 +174,12 @@ public:
     };
 
     /* TODO: move all of this into a common class that is shared with the FlexItem */
-    float width = notAssigned;
-    float minWidth = 0;
+    float width    = notAssigned;
+    float minWidth = 0.0f;
     float maxWidth = notAssigned;
 
-    float height = notAssigned;
-    float minHeight = 0;
+    float height    = notAssigned;
+    float minHeight = 0.0f;
     float maxHeight = notAssigned;
 
     /** Represents a margin. */