diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
index 4de02b05f8..4bbcc0e252 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
@@ -239,11 +239,18 @@ public class SideBySide2 extends Screen {
     Window.enableScrolling(false);
 
     final int height = getCodeMirrorHeight();
-    cmA.setHeight(height);
-    cmB.setHeight(height);
+    operation(new Runnable() {
+      @Override
+      public void run() {
+        cmA.setHeight(height);
+        cmB.setHeight(height);
+        cmA.refresh();
+        cmB.refresh();
+        cmB.setCursor(LineCharacter.create(0));
+        cmB.focus();
+      }
+    });
     diffTable.sidePanel.adjustGutters(cmB);
-    cmB.setCursor(LineCharacter.create(0));
-    cmB.focus();
 
     prefetchNextFile();
   }
@@ -1376,6 +1383,20 @@ public class SideBySide2 extends Screen {
     return cmB;
   }
 
+  void operation(final Runnable apply) {
+    cmA.operation(new Runnable() {
+      @Override
+      public void run() {
+        cmB.operation(new Runnable() {
+          @Override
+          public void run() {
+            apply.run();
+          }
+        });
+      }
+    });
+  }
+
   private void prefetchNextFile() {
     String nextPath = header.getNextPath();
     if (nextPath != null) {