diff --git a/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp b/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp
index dd4dde4d560..3f9716d6a5d 100644
--- a/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp
@@ -443,14 +443,19 @@ nsHTMLEditor::EndMoving()
   }
   mMouseMotionListenerP = nsnull;
 
-  return NS_OK;
+  mGrabberClicked = PR_FALSE;
+  mIsMoving = PR_FALSE;
+  nsCOMPtr<nsISelection> selection;
+  GetSelection(getter_AddRefs(selection));
+  if (!selection) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+  return CheckSelectionStateForAnonymousButtons(selection);
 }
 nsresult
 nsHTMLEditor::SetFinalPosition(PRInt32 aX, PRInt32 aY)
 {
   nsresult res = EndMoving();
-  mGrabberClicked = PR_FALSE;
-  mIsMoving = PR_FALSE;
   if (NS_FAILED(res)) return res;
 
   // we have now to set the new width and height of the resized object
diff --git a/mozilla/editor/libeditor/html/nsHTMLAnonymousUtils.cpp b/mozilla/editor/libeditor/html/nsHTMLAnonymousUtils.cpp
index c65ff94bf39..8d0a7526f9f 100644
--- a/mozilla/editor/libeditor/html/nsHTMLAnonymousUtils.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLAnonymousUtils.cpp
@@ -227,6 +227,11 @@ nsHTMLEditor::CheckSelectionStateForAnonymousButtons(nsISelection * aSelection)
       !mIsInlineTableEditingEnabled)
     return NS_OK;
 
+  // Don't change selection state if we're moving.
+  if (mIsMoving) {
+    return NS_OK;
+  }
+
   nsCOMPtr<nsIDOMElement> focusElement;
   // let's get the containing element of the selection
   nsresult res  = GetSelectionContainer(getter_AddRefs(focusElement));
diff --git a/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp b/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp
index be1e0377c0a..4f76ad17560 100644
--- a/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp
@@ -672,8 +672,6 @@ nsHTMLEditor::MouseUp(PRInt32 aClientX, PRInt32 aClientY,
     }
     if (mGrabberClicked) {
       EndMoving();
-      mGrabberClicked = PR_FALSE;
-      mIsMoving = PR_FALSE;
     }
   }
   return NS_OK;