diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp
index c114d2ba1381..e97710e95495 100644
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -406,7 +406,7 @@ nsImageControlFrame::GetNamesValues(PRInt32 aMaxNumValues, PRInt32& aNumValues,
 
   nsAutoString name;
   nsresult result = GetName(&name);
-  if (NS_CONTENT_ATTR_HAS_VALUE == result) {
+  if (NS_CONTENT_ATTR_HAS_VALUE == result && (name.Length() > 0)) {
     aNames[0] = name;
     aNames[0].AppendWithConversion(".x");
     aNames[1] = name;
diff --git a/layout/html/forms/src/nsImageControlFrame.cpp b/layout/html/forms/src/nsImageControlFrame.cpp
index c114d2ba1381..e97710e95495 100644
--- a/layout/html/forms/src/nsImageControlFrame.cpp
+++ b/layout/html/forms/src/nsImageControlFrame.cpp
@@ -406,7 +406,7 @@ nsImageControlFrame::GetNamesValues(PRInt32 aMaxNumValues, PRInt32& aNumValues,
 
   nsAutoString name;
   nsresult result = GetName(&name);
-  if (NS_CONTENT_ATTR_HAS_VALUE == result) {
+  if (NS_CONTENT_ATTR_HAS_VALUE == result && (name.Length() > 0)) {
     aNames[0] = name;
     aNames[0].AppendWithConversion(".x");
     aNames[1] = name;