diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
index 23af7208e4..f2237c59e4 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.client.diff;
 
+import com.google.gerrit.client.Gerrit;
 import com.google.gerrit.client.changes.ChangeInfo.RevisionInfo;
 import com.google.gerrit.reviewdb.client.PatchSet;
 import com.google.gwt.core.client.GWT;
@@ -100,14 +101,12 @@ class DiffTable extends Composite {
     this.host = host;
   }
 
-  void updateFileCommentVisibility(boolean forceHide) {
-    UIObject.setVisible(patchSetNavRow, !forceHide);
-    if (forceHide || (fileCommentPanelA.getBoxCount() == 0 &&
-        fileCommentPanelB.getBoxCount() == 0)) {
-      UIObject.setVisible(fileCommentRow, false);
-    } else {
-      UIObject.setVisible(fileCommentRow, true);
-    }
+  void setHeaderVisible(boolean show) {
+    Gerrit.setHeaderVisible(show);
+    UIObject.setVisible(patchSetNavRow, show);
+    UIObject.setVisible(fileCommentRow, show
+        && (fileCommentPanelA.getBoxCount() > 0
+            || fileCommentPanelB.getBoxCount() > 0));
     host.resizeCodeMirror();
   }
 
@@ -117,7 +116,7 @@ class DiffTable extends Composite {
 
   void createOrEditFileComment(DisplaySide side) {
     getPanelFromSide(side).createOrEditFileComment();
-    updateFileCommentVisibility(false);
+    setHeaderVisible(true);
   }
 
   void addFileCommentBox(CommentBox box) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/FileCommentPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/FileCommentPanel.java
index f252e65b81..37e017896d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/FileCommentPanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/FileCommentPanel.java
@@ -74,11 +74,11 @@ class FileCommentPanel extends Composite {
   void addFileComment(CommentBox box) {
     boxes.add(box);
     body.add(box);
-    table.updateFileCommentVisibility(false);
+    table.setHeaderVisible(true);
   }
 
   void onRemoveDraftBox(DraftBox box) {
     boxes.remove(box);
-    table.updateFileCommentVisibility(false);
+    table.setHeaderVisible(true);
   }
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ScrollSynchronizer.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ScrollSynchronizer.java
index f5ae14980b..425878c9bd 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ScrollSynchronizer.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ScrollSynchronizer.java
@@ -39,12 +39,10 @@ class ScrollSynchronizer {
 
   private void updateScreenHeader(ScrollInfo si) {
     if (si.getTop() == 0 && !Gerrit.isHeaderVisible()) {
-      Gerrit.setHeaderVisible(true);
-      diffTable.updateFileCommentVisibility(false);
+      diffTable.setHeaderVisible(true);
     } else if (si.getTop() > 0.5 * si.getClientHeight()
         && Gerrit.isHeaderVisible()) {
-      Gerrit.setHeaderVisible(false);
-      diffTable.updateFileCommentVisibility(true);
+      diffTable.setHeaderVisible(false);
     }
   }