diff --git a/src/juce_appframework/gui/components/special/juce_MidiKeyboardComponent.cpp b/src/juce_appframework/gui/components/special/juce_MidiKeyboardComponent.cpp
index ae84f53674..482874a229 100644
--- a/src/juce_appframework/gui/components/special/juce_MidiKeyboardComponent.cpp
+++ b/src/juce_appframework/gui/components/special/juce_MidiKeyboardComponent.cpp
@@ -280,7 +280,7 @@ int MidiKeyboardComponent::remappedXYToNote (int x, int y) const
 {
     if (y < blackNoteLength)
     {
-        for (int octaveStart = 12 * (rangeStart / 12); octaveStart < rangeEnd; octaveStart += 12)
+        for (int octaveStart = 12 * (rangeStart / 12); octaveStart <= rangeEnd; octaveStart += 12)
         {
             for (int i = 0; i < 5; ++i)
             {
@@ -299,7 +299,7 @@ int MidiKeyboardComponent::remappedXYToNote (int x, int y) const
         }
     }
 
-    for (int octaveStart = 12 * (rangeStart / 12); octaveStart < rangeEnd; octaveStart += 12)
+    for (int octaveStart = 12 * (rangeStart / 12); octaveStart <= rangeEnd; octaveStart += 12)
     {
         for (int i = 0; i < 7; ++i)
         {