diff --git a/src/View/Geometry/PlotRKZ.py b/src/View/Geometry/PlotRKZ.py
index 4b1c3772..8305d14f 100644
--- a/src/View/Geometry/PlotRKZ.py
+++ b/src/View/Geometry/PlotRKZ.py
@@ -20,6 +20,7 @@ import logging
 
 from tools import timer
 from View.Tools.PamhyrPlot import PamhyrPlot
+from matplotlib.backend_bases import MouseButton
 from PyQt5.QtWidgets import QApplication
 from PyQt5.QtCore import (
     Qt, QItemSelectionModel,
@@ -64,7 +65,7 @@ class PlotRKZ(PamhyrPlot):
     def onpick(self, event):
         if event.mouseevent.inaxes != self.canvas.axes:
             return
-        if event.mouseevent.button.value != 1:
+        if event.mouseevent.button != MouseButton.LEFT:
             return
 
         modifiers = QApplication.keyboardModifiers()
diff --git a/src/View/Geometry/PlotXY.py b/src/View/Geometry/PlotXY.py
index c2f8c2d4..68d2a0fa 100644
--- a/src/View/Geometry/PlotXY.py
+++ b/src/View/Geometry/PlotXY.py
@@ -18,6 +18,7 @@
 
 from tools import timer, trace
 from View.Tools.PamhyrPlot import PamhyrPlot
+from matplotlib.backend_bases import MouseButton
 from matplotlib import collections
 import numpy as np
 
@@ -60,7 +61,7 @@ class PlotXY(PamhyrPlot):
     def onpick(self, event):
         if event.mouseevent.inaxes != self.canvas.axes:
             return
-        if event.mouseevent.button.value != 1:
+        if event.mouseevent.button != MouseButton.LEFT:
             return
 
         modifiers = QApplication.keyboardModifiers()
diff --git a/src/View/Geometry/Profile/Plot.py b/src/View/Geometry/Profile/Plot.py
index e2829d05..3ce8c27d 100644
--- a/src/View/Geometry/Profile/Plot.py
+++ b/src/View/Geometry/Profile/Plot.py
@@ -22,6 +22,7 @@ from math import dist, sqrt
 
 from tools import timer, trace
 from View.Tools.PamhyrPlot import PamhyrPlot
+from matplotlib.backend_bases import MouseButton
 
 from PyQt5.QtCore import (
     Qt, QCoreApplication, QItemSelectionModel,
@@ -111,7 +112,7 @@ class Plot(PamhyrPlot):
     def onpick(self, event):
         if event.mouseevent.inaxes != self.canvas.axes:
             return
-        if event.mouseevent.button.value != 1:
+        if event.mouseevent.button != MouseButton.LEFT:
             return
 
         modifiers = QApplication.keyboardModifiers()
@@ -126,11 +127,11 @@ class Plot(PamhyrPlot):
     def onclick(self, event):
         if event.inaxes != self.canvas.axes:
             return
-        if event.button.value == 1:
+        if event.button not in (MouseButton.MIDDLE, MouseButton.RIGHT):
             return
 
         z = self._get_z_from_click(event)
-        if z < self.data.z_min() or event.button.value == 2:
+        if z < self.data.z_min() or event.button == MouseButton.MIDDLE:
             self.highlight = None
             self.draw_highligth()
             self.update_idle()
diff --git a/src/View/HydraulicStructures/PlotRKC.py b/src/View/HydraulicStructures/PlotRKC.py
index 4c4a982b..e65150d6 100644
--- a/src/View/HydraulicStructures/PlotRKC.py
+++ b/src/View/HydraulicStructures/PlotRKC.py
@@ -18,6 +18,7 @@
 
 from tools import timer
 from View.Tools.PamhyrPlot import PamhyrPlot
+from matplotlib.backend_bases import MouseButton
 
 from PyQt5.QtCore import (
     QCoreApplication, Qt,
@@ -243,7 +244,7 @@ class PlotRKC(PamhyrPlot):
     def onpick(self, event):
         if event.mouseevent.inaxes != self.canvas.axes:
             return
-        if event.mouseevent.button.value != 1:
+        if event.mouseevent.button != MouseButton.LEFT:
             return
 
         modifiers = QApplication.keyboardModifiers()
diff --git a/src/View/Results/PlotXY.py b/src/View/Results/PlotXY.py
index 1845660d..3031b712 100644
--- a/src/View/Results/PlotXY.py
+++ b/src/View/Results/PlotXY.py
@@ -24,6 +24,7 @@ import numpy as np
 
 from tools import timer, trace, logger_exception
 from View.Tools.PamhyrPlot import PamhyrPlot
+from matplotlib.backend_bases import MouseButton
 from matplotlib import collections
 
 from PyQt5.QtCore import (
@@ -89,7 +90,7 @@ class PlotXY(PamhyrPlot):
     def onpick(self, event):
         if event.mouseevent.inaxes != self.canvas.axes:
             return
-        if event.mouseevent.button.value != 1:
+        if event.mouseevent.button != MouseButton.LEFT:
             return
 
         modifiers = QApplication.keyboardModifiers()