--- firexpath-0.9.5.orig/content/FirePathPanel.js
+++ firexpath-0.9.5/content/FirePathPanel.js
@@ -1814,8 +1814,11 @@ Firebug.FirePathPanel.ResultHighlightMod
 		var element;
 		while(element = this.highlightedElement.pop()) {
 			removeClass(element, "firepath-matching-node");
-			if (element.className === '' || (element.className && element.className.trim().length === 0)) {
-				element.removeAttribute("class");
+			if (element.className) {
+				element.className = element.className.trim();
+				if(element.className.length === 0) {
+					element.removeAttribute("class");
+				}
 			}
 		}
 	}
