diff --git a/src/main/java/fr/univlille/sae/classification/controller/DataVisualizationController.java b/src/main/java/fr/univlille/sae/classification/controller/DataVisualizationController.java
index 5ef74cc7e39ae4b8cb3dd04ad4ae9900740f78e6..334070ef02648daaa144c46b1e58d1ee0bfc1276 100644
--- a/src/main/java/fr/univlille/sae/classification/controller/DataVisualizationController.java
+++ b/src/main/java/fr/univlille/sae/classification/controller/DataVisualizationController.java
@@ -142,8 +142,8 @@ public abstract class DataVisualizationController {
         this.AxesSelected.setText(texte);
     }
 
-    public void setAxesSelectedDisable(){
-        this.AxesSelected.setDisable(true);
+    public void setAxesSelectedDisability(boolean disability){
+        this.AxesSelected.setDisable(disability);
     }
 
 
diff --git a/src/main/java/fr/univlille/sae/classification/utils/ViewUtil.java b/src/main/java/fr/univlille/sae/classification/utils/ViewUtil.java
index 01357ad774a623f225dd3570bf98dea04eb5c5bd..124b5f119c911e7b58ba5d6dca2d9a8506eddb09 100644
--- a/src/main/java/fr/univlille/sae/classification/utils/ViewUtil.java
+++ b/src/main/java/fr/univlille/sae/classification/utils/ViewUtil.java
@@ -26,6 +26,8 @@ import java.util.Map;
  */
 public class ViewUtil {
 
+    private static Shape clickedForm;
+
     /**
      * Définit la couleur de la forme
      * @param form       forme à configurer.
@@ -39,14 +41,20 @@ public class ViewUtil {
             form.setFill(color);
 
             form.setOnMouseClicked(e -> {
+                if(clickedForm!=null) {
+                    clickedForm.setStyle("-fx-stroke-width: 0;");
+                }
                 if (controller instanceof DataStageController) {
                     DataStageController dataController = (DataStageController) controller;
                     dataController.getPointInfo().getItems().clear();
                     dataController.getPointInfo().getItems().add(dataLoaded.toString());
+                    form.setStyle("-fx-stroke-width: 2;");
                 } else if (controller instanceof MainStageController) {
                     MainStageController mainController = (MainStageController) controller;
                     mainController.getPointInfo().getItems().clear();
                     mainController.getPointInfo().getItems().add(dataLoaded.toString());
+                    form.setStyle("-fx-stroke: #60ffc6; -fx-stroke-width: 3;");
+                    clickedForm = form;
                 } else {
                     System.err.println("Contrôleur inconnu");
                 }
diff --git a/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java b/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java
index 39a043e791baf5e8e17a725fe29256f61f13461d..3ab3443db4aca9a7349b5f9206f3bbb6d68482fd 100644
--- a/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/DataVisualizationView.java
@@ -124,11 +124,12 @@ public abstract class DataVisualizationView {
             scatterChart.getData().clear();
             serieList.clear();
 
-            if (actualX == null && actualY == null) {
+            if (actualX == null && actualY == null || actualY.isEmpty() || actualX.isEmpty()) {
                 controller.setAxesSelected("Aucuns axes sélectionnés");
+                controller.setAxesSelectedDisability(false);
             } else {
                 controller.setAxesSelected("");
-                controller.setAxesSelectedDisable();
+                controller.setAxesSelectedDisability(true);
 
                 List<LoadableData> points = new ArrayList<>(model.getDatas());
                 points.addAll(model.getDataToClass().keySet());
@@ -207,8 +208,9 @@ public abstract class DataVisualizationView {
             }
 
             LoadableData newData = (LoadableData) data;
-            if (actualX == null || actualY == null) {
+            if (actualX == null || actualY == null || actualY.isEmpty() || actualX.isEmpty()) {
                 controller.setAxesSelected("Aucuns axes sélectionnés");
+                controller.setAxesSelectedDisability(false);
                 return;
             }
             Object attrX = newData.getAttributesNames().get(actualX);