diff --git a/mozilla/editor/base/nsHTMLEditRules.cpp b/mozilla/editor/base/nsHTMLEditRules.cpp
index 9a4e8ec7438..abdd25847c8 100644
--- a/mozilla/editor/base/nsHTMLEditRules.cpp
+++ b/mozilla/editor/base/nsHTMLEditRules.cpp
@@ -1584,7 +1584,6 @@ nsHTMLEditRules::WillAlign(nsIDOMSelection *aSelection,
   *aCancel = PR_FALSE;
   *aHandled = PR_FALSE;
   
-  nsAutoSelectionReset selectionResetter(aSelection);
 
   PRBool outMakeEmpty;
   res = ShouldMakeEmptyBlock(aSelection, alignType, &outMakeEmpty);
@@ -1611,6 +1610,8 @@ nsHTMLEditRules::WillAlign(nsIDOMSelection *aSelection,
     return res;
   }
 
+  nsAutoSelectionReset selectionResetter(aSelection);
+
   // convert the selection ranges into "promoted" selection ranges:
   // this basically just expands the range to include the immediate
   // block parent, and then further expands to include any ancestors
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
index 9a4e8ec7438..abdd25847c8 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
@@ -1584,7 +1584,6 @@ nsHTMLEditRules::WillAlign(nsIDOMSelection *aSelection,
   *aCancel = PR_FALSE;
   *aHandled = PR_FALSE;
   
-  nsAutoSelectionReset selectionResetter(aSelection);
 
   PRBool outMakeEmpty;
   res = ShouldMakeEmptyBlock(aSelection, alignType, &outMakeEmpty);
@@ -1611,6 +1610,8 @@ nsHTMLEditRules::WillAlign(nsIDOMSelection *aSelection,
     return res;
   }
 
+  nsAutoSelectionReset selectionResetter(aSelection);
+
   // convert the selection ranges into "promoted" selection ranges:
   // this basically just expands the range to include the immediate
   // block parent, and then further expands to include any ancestors