2 files changed, 14 insertions, 0 deletions
diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java
index a9f7f743e3..ed74b4c664 100644
--- a/server/src/main/java/com/vaadin/ui/Grid.java
+++ b/server/src/main/java/com/vaadin/ui/Grid.java
@@ -1119,6 +1119,9 @@ public class Grid<T> extends AbstractListing<T> implements HasComponents,
          */
         public Column<T, V> setCaption(String caption) {
             Objects.requireNonNull(caption, "Header caption can't be null");
+            if (caption.equals(getState(false).caption)) {
+                return this;
+            }
             getState().caption = caption;
 
             HeaderRow row = getGrid().getDefaultHeaderRow();
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/Header.java b/server/src/main/java/com/vaadin/ui/components/grid/Header.java
index 421d616387..b6668a0ae2 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/Header.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/Header.java
@@ -53,6 +53,17 @@ public abstract class Header extends StaticSection<Header.Row> {
             protected Cell() {
                 super(Row.this);
             }
+
+            @Override
+            public void setText(String text) {
+                super.setText(text);
+                if (isDefault()) {
+                    Column<?, ?> col = getColumnByInternalId(getColumnId());
+                    if (col != null) {
+                        col.setCaption(text);
+                    }
+                }
+            }
         }
 
         /**