diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index e3c21f545b2..a4ecb5fee42 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -412,6 +412,10 @@ nsEventStateManager::CheckForAndDispatchClick(nsIPresContext& aPresContext,
       ret = mouseContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, aStatus); 
       NS_RELEASE(mouseContent);
     }
+
+    if (nsnull != mCurrentTarget) {
+      ret = mCurrentTarget->HandleEvent(aPresContext, &event, aStatus);
+    }
   }
   return ret;
 }
diff --git a/layout/events/src/nsEventStateManager.cpp b/layout/events/src/nsEventStateManager.cpp
index e3c21f545b2..a4ecb5fee42 100644
--- a/layout/events/src/nsEventStateManager.cpp
+++ b/layout/events/src/nsEventStateManager.cpp
@@ -412,6 +412,10 @@ nsEventStateManager::CheckForAndDispatchClick(nsIPresContext& aPresContext,
       ret = mouseContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, aStatus); 
       NS_RELEASE(mouseContent);
     }
+
+    if (nsnull != mCurrentTarget) {
+      ret = mCurrentTarget->HandleEvent(aPresContext, &event, aStatus);
+    }
   }
   return ret;
 }
diff --git a/layout/xul/base/src/nsToolboxFrame.cpp b/layout/xul/base/src/nsToolboxFrame.cpp
index e4b335d86f7..8ca26353a4d 100644
--- a/layout/xul/base/src/nsToolboxFrame.cpp
+++ b/layout/xul/base/src/nsToolboxFrame.cpp
@@ -662,8 +662,7 @@ nsToolboxFrame :: HandleEvent ( nsIPresContext& aPresContext,
  
   switch ( aEvent->message ) {
 
-//  case NS_MOUSE_LEFT_CLICK:
-    case NS_MOUSE_LEFT_BUTTON_UP:
+    case NS_MOUSE_LEFT_CLICK:
       OnMouseLeftClick ( aEvent->point );
       break;