diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
index cd57245aa8c..94e9e12d602 100644
--- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
+++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
@@ -4076,10 +4076,6 @@ GetFontNames(const char* aPattern, PRBool aAnyFoundry, PRBool aOnlyOutlineScaled
     points = atoi(pointSize);
 
     if (pixels) {
-      if (!NodeAddSize(stretch, pixels, points, 1.0f, resX, resY, name, familyName, weightName, 
-                  slant, setWidth, addStyle, spacing, charSetName, charSetInfo))
-        continue;
-
       if (gScaleBitmapFontsWithDevScale && (gDevScale > 1.0f)) {
         /* Add a font size which is exactly scaled as the scaling factor ... */
         if (!NodeAddSize(stretch, pixels, points, gDevScale, resX, resY, name, familyName, weightName, 
@@ -4102,6 +4098,12 @@ GetFontNames(const char* aPattern, PRBool aAnyFoundry, PRBool aOnlyOutlineScaled
           continue; /* |NodeAddSize| returned an error in the loop above... */
         }
       }
+      else
+      {
+        if (!NodeAddSize(stretch, pixels, points, 1.0f, resX, resY, name, familyName, weightName, 
+                         slant, setWidth, addStyle, spacing, charSetName, charSetInfo))
+          continue;     
+      }
     }
   }
   XFreeFontNames(list);
diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
index 3e7298f58a0..6671ba664bc 100644
--- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
+++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
@@ -4470,10 +4470,6 @@ GetFontNames(const char* aPattern, PRBool aAnyFoundry, PRBool aOnlyOutlineScaled
     points = atoi(pointSize);
 
     if (pixels) {
-      if (!NodeAddSize(stretch, pixels, points, 1.0f, resX, resY, name, familyName, weightName, 
-                  slant, setWidth, addStyle, spacing, charSetName, charSetInfo))
-        continue;
-
       if (gScaleBitmapFontsWithDevScale && (gDevScale > 1.0f)) {
         /* Add a font size which is exactly scaled as the scaling factor ... */
         if (!NodeAddSize(stretch, pixels, points, gDevScale, resX, resY, name, familyName, weightName, 
@@ -4496,6 +4492,12 @@ GetFontNames(const char* aPattern, PRBool aAnyFoundry, PRBool aOnlyOutlineScaled
           continue; /* |NodeAddSize| returned an error in the loop above... */
         }
       }
+      else
+      {
+        if (!NodeAddSize(stretch, pixels, points, 1.0f, resX, resY, name, familyName, weightName, 
+                         slant, setWidth, addStyle, spacing, charSetName, charSetInfo))
+          continue;     
+      }
     }
   }
   XFreeFontNames(list);