diff --git a/src/juce_appframework/gui/components/special/juce_MidiKeyboardComponent.cpp b/src/juce_appframework/gui/components/special/juce_MidiKeyboardComponent.cpp
index 054f470ef2..a4a723214e 100644
--- a/src/juce_appframework/gui/components/special/juce_MidiKeyboardComponent.cpp
+++ b/src/juce_appframework/gui/components/special/juce_MidiKeyboardComponent.cpp
@@ -699,7 +699,7 @@ void MidiKeyboardComponent::resetAnyKeysInUse()
 
 void MidiKeyboardComponent::updateNoteUnderMouse (int x, int y)
 {
-    const int newNote = xyToNote (x, y);
+    const int newNote = (mouseDragging || isMouseOver()) ? xyToNote (x, y) : -1;
 
     if (noteUnderMouse != newNote)
     {