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 4fe3acb01ce7992813d6b72955d842bfe046887d..a2e6be19085073a80833d0e1108c79e2dd9fb14b 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
@@ -151,11 +151,9 @@ public class DistanceAction extends ControlPanelAction {
         
         switch (action) {
             case DistancePanel.ACTION_COMMAND_SHOW_HIDE_HEATMAP:
-                if (((JToggleButton) ae.getSource()).isSelected()) {
+                heatmapRender = ((JToggleButton) ae.getSource()).isSelected();
+                if (heatmapRender) {
                     updateHausdorffDistanceInformation();
-                    heatmapRender = true;
-                } else {
-                    heatmapRender = false;
                 }
                 getSecondaryDrawableFace().setRenderHeatmap(heatmapRender);
                 break;
diff --git a/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationAction.java b/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationAction.java
index 360a964a8936ae0c997924ac3638b1fe7384947c..7cc5713639cd4392010b0f9fa7328a1a15ddbc11 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationAction.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/registration/RegistrationAction.java
@@ -232,12 +232,10 @@ public class RegistrationAction extends ControlPanelAction {
                 }
                 break;
             case RegistrationPanel.ACTION_COMMAND_HD_HEATMAP:
-                if (((JToggleButton) ae.getSource()).isSelected()) {
+                heatmapRender = ((JToggleButton) ae.getSource()).isSelected();
+                if (heatmapRender) {
                     calculateHausdorffDistance();
                     setHeatmap();
-                    heatmapRender = true;
-                } else {
-                    heatmapRender = false;
                 }
                 getSecondaryDrawableFace().setRenderHeatmap(heatmapRender);
                 break;