Index: src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 5866)
+++ src/org/openstreetmap/josm/gui/NavigatableComponent.java	(working copy)
@@ -1277,7 +1277,7 @@
          */
         public String getAreaText(double area) {
             double a = area / (aValue*aValue);
-            if (!Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false) && a > bValue / aValue) {
+            if (!Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false) && a > bValue*bValue / aValue*aValue ) {
                 double b = area / (bValue*bValue);
                 return String.format(Locale.US, "%." + (b<10 ? 2 : 1) + "f %s", b, bName+"\u00b2");
             } else if (a < 0.01)