diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 9d5f9d7ad31..98281e56120 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -5989,8 +5989,8 @@ PresShell::HandleEvent(nsIView         *aView,
   if (nsnull != frame) {
     PushCurrentEventInfo(nsnull, nsnull);
 
-    nsIEventStateManager *manager;
-    if (NS_OK == mPresContext->GetEventStateManager(&manager)) {
+    nsCOMPtr<nsIEventStateManager> manager;
+    if (NS_OK == mPresContext->GetEventStateManager(getter_AddRefs(manager))) {
       //change 6-01-00 mjudge,ftang adding ime as an event that needs focused element
       if (NS_IS_KEY_EVENT(aEvent) || NS_IS_IME_EVENT(aEvent) || aEvent->message == NS_CONTEXTMENU_KEY) { 
         //Key events go to the focused frame, not point based.
@@ -6133,7 +6133,6 @@ PresShell::HandleEvent(nsIView         *aView,
       if (GetCurrentEventFrame()) {
         rv = HandleEventInternal(aEvent, aView, NS_EVENT_FLAG_INIT, aEventStatus);
       }
-      NS_RELEASE(manager);
     }
 #ifdef NS_DEBUG
     if ((nsIFrameDebug::GetShowEventTargetFrameBorder()) && (GetCurrentEventFrame())) {
diff --git a/layout/html/base/src/nsPresShell.cpp b/layout/html/base/src/nsPresShell.cpp
index 9d5f9d7ad31..98281e56120 100644
--- a/layout/html/base/src/nsPresShell.cpp
+++ b/layout/html/base/src/nsPresShell.cpp
@@ -5989,8 +5989,8 @@ PresShell::HandleEvent(nsIView         *aView,
   if (nsnull != frame) {
     PushCurrentEventInfo(nsnull, nsnull);
 
-    nsIEventStateManager *manager;
-    if (NS_OK == mPresContext->GetEventStateManager(&manager)) {
+    nsCOMPtr<nsIEventStateManager> manager;
+    if (NS_OK == mPresContext->GetEventStateManager(getter_AddRefs(manager))) {
       //change 6-01-00 mjudge,ftang adding ime as an event that needs focused element
       if (NS_IS_KEY_EVENT(aEvent) || NS_IS_IME_EVENT(aEvent) || aEvent->message == NS_CONTEXTMENU_KEY) { 
         //Key events go to the focused frame, not point based.
@@ -6133,7 +6133,6 @@ PresShell::HandleEvent(nsIView         *aView,
       if (GetCurrentEventFrame()) {
         rv = HandleEventInternal(aEvent, aView, NS_EVENT_FLAG_INIT, aEventStatus);
       }
-      NS_RELEASE(manager);
     }
 #ifdef NS_DEBUG
     if ((nsIFrameDebug::GetShowEventTargetFrameBorder()) && (GetCurrentEventFrame())) {