diff --git a/editor/base/nsHTMLEditor.cpp b/editor/base/nsHTMLEditor.cpp
index 11e008e9371a..5a9aab3f7465 100644
--- a/editor/base/nsHTMLEditor.cpp
+++ b/editor/base/nsHTMLEditor.cpp
@@ -895,11 +895,11 @@ nsHTMLEditor::GetSelectedElement(const nsString& aTagName, nsIDOMElement** aRetu
                   nsString tmpText;
                   if( aTagName == "HREF")
                   {
-                    if (NS_SUCCEEDED(anchor->GetHref(tmpText)) && tmpText && tmpText != "")
+                    if (NS_SUCCEEDED(anchor->GetHref(tmpText)) && tmpText.GetUnicode() && tmpText.Length() != 0)
                       bNodeFound = PR_TRUE;
                   } else if (aTagName == "ANCHOR")
                   {
-                    if (NS_SUCCEEDED(anchor->GetName(tmpText)) && tmpText && tmpText != "")
+                    if (NS_SUCCEEDED(anchor->GetName(tmpText)) && tmpText.GetUnicode() && tmpText.Length() != 0)
                       bNodeFound = PR_TRUE;
                   }
                 }
diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp
index 11e008e9371a..5a9aab3f7465 100644
--- a/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/editor/libeditor/html/nsHTMLEditor.cpp
@@ -895,11 +895,11 @@ nsHTMLEditor::GetSelectedElement(const nsString& aTagName, nsIDOMElement** aRetu
                   nsString tmpText;
                   if( aTagName == "HREF")
                   {
-                    if (NS_SUCCEEDED(anchor->GetHref(tmpText)) && tmpText && tmpText != "")
+                    if (NS_SUCCEEDED(anchor->GetHref(tmpText)) && tmpText.GetUnicode() && tmpText.Length() != 0)
                       bNodeFound = PR_TRUE;
                   } else if (aTagName == "ANCHOR")
                   {
-                    if (NS_SUCCEEDED(anchor->GetName(tmpText)) && tmpText && tmpText != "")
+                    if (NS_SUCCEEDED(anchor->GetName(tmpText)) && tmpText.GetUnicode() && tmpText.Length() != 0)
                       bNodeFound = PR_TRUE;
                   }
                 }