diff --git a/src/drivers/Qt/TasEditor/playback.cpp b/src/drivers/Qt/TasEditor/playback.cpp
index bab5a905..b94e5186 100644
--- a/src/drivers/Qt/TasEditor/playback.cpp
+++ b/src/drivers/Qt/TasEditor/playback.cpp
@@ -705,3 +705,19 @@ void UpperMarkerNoteEdit::keyPressEvent(QKeyEvent *event)
 	}
 }
 // -------------------------------------------------------------------------
+void UpperMarkerNoteEdit::mousePressEvent(QMouseEvent * event)
+{
+	if ( event->button() == Qt::MiddleButton )
+	{
+		playback->handleMiddleButtonClick();
+	}
+	else if ( (event->button() == Qt::LeftButton) || (event->button() == Qt::RightButton) )
+	{
+		// scroll to the Marker
+		if (taseditorConfig->followMarkerNoteContext)
+		{
+			tasWin->pianoRoll->followMarker(playback->displayedMarkerNumber);
+		}
+	}
+}
+// -------------------------------------------------------------------------
diff --git a/src/drivers/Qt/TasEditor/playback.h b/src/drivers/Qt/TasEditor/playback.h
index 4a063fb5..12036bdc 100644
--- a/src/drivers/Qt/TasEditor/playback.h
+++ b/src/drivers/Qt/TasEditor/playback.h
@@ -22,6 +22,7 @@ class UpperMarkerNoteEdit : public QLineEdit
 		void focusInEvent(QFocusEvent *event);
 		void focusOutEvent(QFocusEvent *event);
 		void keyPressEvent(QKeyEvent *event);
+		void mousePressEvent(QMouseEvent * event);
 };
 
 class PLAYBACK
diff --git a/src/drivers/Qt/TasEditor/selection.cpp b/src/drivers/Qt/TasEditor/selection.cpp
index 65cdfc99..585b8b78 100644
--- a/src/drivers/Qt/TasEditor/selection.cpp
+++ b/src/drivers/Qt/TasEditor/selection.cpp
@@ -985,3 +985,20 @@ void LowerMarkerNoteEdit::keyPressEvent(QKeyEvent *event)
 	}
 }
 // -------------------------------------------------------------------------
+void LowerMarkerNoteEdit::mousePressEvent(QMouseEvent * event)
+{
+
+	if ( event->button() == Qt::MiddleButton )
+	{
+		playback->handleMiddleButtonClick();
+	}
+	else if ( (event->button() == Qt::LeftButton) || (event->button() == Qt::RightButton) )
+	{
+		// scroll to the Marker
+		if (taseditorConfig->followMarkerNoteContext)
+		{
+			tasWin->pianoRoll->followMarker(selection->displayedMarkerNumber);
+		}
+	}
+}
+// -------------------------------------------------------------------------
diff --git a/src/drivers/Qt/TasEditor/selection.h b/src/drivers/Qt/TasEditor/selection.h
index 029e823e..84b464a3 100644
--- a/src/drivers/Qt/TasEditor/selection.h
+++ b/src/drivers/Qt/TasEditor/selection.h
@@ -23,6 +23,7 @@ class LowerMarkerNoteEdit : public QLineEdit
 		void focusInEvent(QFocusEvent *event);
 		void focusOutEvent(QFocusEvent *event);
 		void keyPressEvent(QKeyEvent *event);
+		void mousePressEvent(QMouseEvent * event);
 };
 
 class SELECTION