diff --git a/layout/xul/base/src/nsTreeFrame.cpp b/layout/xul/base/src/nsTreeFrame.cpp
index d51def8d91bf..ada1d692723e 100644
--- a/layout/xul/base/src/nsTreeFrame.cpp
+++ b/layout/xul/base/src/nsTreeFrame.cpp
@@ -177,11 +177,11 @@ nsTreeFrame::RemoveFromSelection(nsIPresContext& aPresContext, nsTreeCellFrame*
 		nsTreeCellFrame* theFrame = (nsTreeCellFrame*)mSelectedItems[i];
     if (theFrame == frame) {
       mSelectedItems.RemoveElementAt(i);
-      break;
+	  FireChangeHandler(aPresContext);
+      return;
     }
 	}
 
-  FireChangeHandler(aPresContext);
 }
 
 void nsTreeFrame::MoveUp(nsIPresContext& aPresContext, nsTreeCellFrame* pFrame)