diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
index 405c45b578..592ddee67e 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
@@ -540,8 +540,8 @@ public void updateRow(TransUnit updatedTransUnit)
       if (contentsDisplayOptional.isPresent())
       {
          TargetContentsDisplay contentsDisplay = contentsDisplayOptional.get();
-         contentsDisplay.setState(TargetContentsDisplay.EditingState.SAVED);
          contentsDisplay.setValueAndCreateNewEditors(updatedTransUnit);
+         contentsDisplay.setState(TargetContentsDisplay.EditingState.SAVED);
          contentsDisplay.refresh();
          if (equal(updatedTransUnit.getId(), currentTransUnitId))
          {
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
index be78d1a81d..d663d92713 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
@@ -533,8 +533,10 @@ public void canUpdateRowIfInCurrentDisplays()
 
       presenter.updateRow(updatedTransUnit);
 
-      verify(display).setValueAndCreateNewEditors(updatedTransUnit);
-      verify(display).refresh();
+      InOrder inOrder = Mockito.inOrder(display);
+      inOrder.verify(display).setValueAndCreateNewEditors(updatedTransUnit);
+      inOrder.verify(display).setState(TargetContentsDisplay.EditingState.SAVED);
+      inOrder.verify(display).refresh();
    }
 
    @Test