diff --git a/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java b/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
index b2f1f80aead2a05b19d283f85ea679087c4a1fe9..8264d4f558a398df281f7fca3a8d9a63a2499a14 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
@@ -33,7 +33,7 @@ public class DistanceAction extends ControlPanelAction {
      * Attributes handling the state
      */
     private HausdorffDistancePrioritized visitor = null;
-    private final Map<FeaturePointType, Double> featurePointTypes = new HashMap<>();
+    private final Map<FeaturePointType, Double> featurePointTypes;
     private String strategy = DistancePanel.STRATEGY_POINT_TO_POINT;
     private boolean relativeDist = false;
     private boolean weightedDist = false;
@@ -55,6 +55,12 @@ public class DistanceAction extends ControlPanelAction {
         super(canvas, topControlPanel);
         this.controlPanel = new DistancePanel(this, getSecondaryFeaturePoints().getFeaturePoints());
         
+        this.featurePointTypes = getSecondaryFeaturePoints().getFeaturePoints()
+                .stream()
+                .collect(Collectors.toMap(
+                        FeaturePoint::getFeaturePointType,
+                        featurePoint -> DrawableFeaturePoints.DEFAULT_SIZE));
+        
         // Place control panel to the topControlPanel
         topControlPanel.addTab(controlPanel.getName(), controlPanel.getIcon(), controlPanel);
         topControlPanel.addChangeListener(e -> {
diff --git a/GUI/src/main/java/cz/fidentis/analyst/distance/DistancePanel.java b/GUI/src/main/java/cz/fidentis/analyst/distance/DistancePanel.java
index 07009dcca4ef254579a9673ec529e2a7ed4595af..a520e95eca88e819ad031a9fab3a7b6a95dff06a 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/distance/DistancePanel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/distance/DistancePanel.java
@@ -89,7 +89,7 @@ public class DistancePanel extends ControlPanel {
             final FeaturePoint featurePoint = featurePoints.get(i);
             
             final JCheckBox checkBox = fpBuilder.addCheckBox(
-                    false,
+                    true,
                     createListener(action, ACTION_COMMAND_DISTANCE_RECOMPUTE)
             );
             checkBox.setText(featurePoint.getFeaturePointType().getName());