diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
index 11254f59448..14ce0855fdf 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
@@ -953,4 +953,4 @@ hasSplitFleetContiguousScoring=Split fleets scored contiguously
 overallProgress=Overall Progress
 eventOverview=Event Overview
 start=Start
-showAddedScores=Show added scores
\ No newline at end of file
+showAddedScores=Show added scores for each entry in leaderboard
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
index 79e43d4ddd0..3dabff0f43b 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
@@ -949,4 +949,4 @@ hasSplitFleetContiguousScoring=Gruppen durchgängig bepunkten
 overallProgress=Gesamtfortschritt
 eventOverview=Veranstaltungsübersicht
 start=Start
-showAddedScores=Addierte Punkte anzeigen
\ No newline at end of file
+showAddedScores=Addierte Punkte für jeden Eintrag im Leaderboard anzeigen
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
index c82ef1790bd..f638e107174 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
@@ -1471,6 +1471,7 @@ public class LeaderboardPanel extends SimplePanel implements TimeListener, PlayS
         } else {
             leaderboardTable.setSelectionModel(leaderboardSelectionModel);
         }
+        setShowAddedScores(settings.isShowAddedScores());
         loadCompleteLeaderboard(getLeaderboardDisplayDate());
 
         if (this.preSelectedRace == null) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsDialogComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsDialogComponent.java
index 73f67528c6b..b7d11893697 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsDialogComponent.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsDialogComponent.java
@@ -100,6 +100,7 @@ public class LeaderboardSettingsDialogComponent implements SettingsDialogCompone
         List<DetailType> currentMeneuverDetailSelection = maneuverDetailSelection;
         for (DetailType detailType : ManeuverCountRaceColumn.getAvailableManeuverDetailColumnTypes()) {
             CheckBox checkbox = dialog.createCheckbox(DetailTypeFormatter.format(detailType));
+            dialog.addTooltip(checkbox, DetailTypeFormatter.getTooltip(detailType));
             checkbox.setValue(currentMeneuverDetailSelection.contains(detailType));
             maneuverDetailCheckboxes.put(detailType, checkbox);
             meneuverContent.add(checkbox);
@@ -133,12 +134,6 @@ public class LeaderboardSettingsDialogComponent implements SettingsDialogCompone
         FlowPanel raceDetailDialog = new FlowPanel();
         raceDetailDialog.add(dialog.createHeadline(stringMessages.raceDetailsToShow(), true));
         raceDetailDialog.addStyleName("SettingsDialogComponent");
-        // Make it possible to configure added points
-        FlowPanel addedScoresFlowPanel = new FlowPanel();
-        showAddedScoresCheckBox = dialog.createCheckbox(stringMessages.showAddedScores());
-        showAddedScoresCheckBox.setValue(showAddedScores);
-        addedScoresFlowPanel.add(showAddedScoresCheckBox);
-        raceDetailDialog.add(addedScoresFlowPanel);
         int detailCountInCurrentFlowPanel = 0;
         List<DetailType> currentRaceDetailSelection = raceDetailSelection;
         FlowPanel raceDetailDialogContent = null;
@@ -150,10 +145,19 @@ public class LeaderboardSettingsDialogComponent implements SettingsDialogCompone
             }
             CheckBox checkbox = dialog.createCheckbox(DetailTypeFormatter.format(type));
             checkbox.setValue(currentRaceDetailSelection.contains(type));
+            dialog.addTooltip(checkbox, DetailTypeFormatter.getTooltip(type));
             raceDetailCheckboxes.put(type, checkbox);
             raceDetailDialogContent.add(checkbox);
             detailCountInCurrentFlowPanel++;
         }
+        // Make it possible to configure added points
+        FlowPanel addedScoresFlowPanel = new FlowPanel();
+        addedScoresFlowPanel.addStyleName("dialogInnerContent");
+        showAddedScoresCheckBox = dialog.createCheckbox(stringMessages.showAddedScores());
+        dialog.addTooltip(showAddedScoresCheckBox, stringMessages.showAddedScores());
+        showAddedScoresCheckBox.setValue(showAddedScores);
+        addedScoresFlowPanel.add(showAddedScoresCheckBox);
+        raceDetailDialog.add(addedScoresFlowPanel);
         return raceDetailDialog;
     }
 
@@ -166,6 +170,7 @@ public class LeaderboardSettingsDialogComponent implements SettingsDialogCompone
         List<DetailType> currentOverallDetailSelection = overallDetailSelection;
         for (DetailType type : LeaderboardPanel.getAvailableOverallDetailColumnTypes()) {
             CheckBox checkbox = dialog.createCheckbox(DetailTypeFormatter.format(type));
+            dialog.addTooltip(checkbox, DetailTypeFormatter.getTooltip(type));
             checkbox.setValue(currentOverallDetailSelection.contains(type));
             overallDetailCheckboxes.put(type, checkbox);
             overallDetailDialogContent.add(checkbox);
@@ -188,6 +193,7 @@ public class LeaderboardSettingsDialogComponent implements SettingsDialogCompone
                 legDetailsToShow.add(legDetailsContent);
             }
             CheckBox checkbox = dialog.createCheckbox(DetailTypeFormatter.format(type));
+            dialog.addTooltip(checkbox, DetailTypeFormatter.getTooltip(type));
             checkbox.setValue(currentLegDetailSelection.contains(type));
             legDetailCheckboxes.put(type, checkbox);
             legDetailsContent.add(checkbox);
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/ui/DataEntryDialog.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/ui/DataEntryDialog.java
index a712fa73a67..036e45f224d 100755
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/ui/DataEntryDialog.java
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/ui/DataEntryDialog.java
@@ -20,6 +20,7 @@ import com.google.gwt.user.client.ui.DoubleBox;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.LongBox;
@@ -385,6 +386,10 @@ public abstract class DataEntryDialog<T> {
         EntryPointUtils.linkEscapeToButton(getCancelButton(), result);
         return result;
     }
+    
+    public void addTooltip(IsWidget widget, String tooltip) {
+        widget.asWidget().setTitle(tooltip);
+    }
 
     public RadioButton createRadioButton(String radioButtonGroupName, String radioButtonLabel) {
         RadioButton result = new RadioButton(radioButtonGroupName, radioButtonLabel);