diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css
index 9959fddfd..a952e81dc 100644
--- a/data/themes/classic/style.css
+++ b/data/themes/classic/style.css
@@ -123,7 +123,7 @@ PianoRoll {
 	qproperty-backgroundShade: rgba( 255, 255, 255, 10 );
 	qproperty-noteModeColor: rgb( 255, 255, 255 );
 	qproperty-noteColor: rgb( 119, 199, 216 );
-        qproperty-noteTextColor: rgb( 255, 255, 255 );
+	qproperty-noteTextColor: rgb( 255, 255, 255 );
 	qproperty-noteOpacity: 128;
 	qproperty-noteBorders: true; /* boolean property, set false to have borderless notes */
 	qproperty-selectedNoteColor: rgb( 0, 125, 255 );
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index 53a899d8d..a0ddd3b41 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -142,7 +142,7 @@ PianoRoll {
 	qproperty-backgroundShade: rgba(255, 255, 255, 10);
 	qproperty-noteModeColor: #0bd556;
 	qproperty-noteColor: #0bd556;
-        qproperty-noteTextColor: #ffffff;
+	qproperty-noteTextColor: #ffffff;
 	qproperty-noteOpacity: 165;
 	qproperty-noteBorders: false; /* boolean property, set false to have borderless notes */
 	qproperty-selectedNoteColor: #064d79;
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 983ffcdc3..7a38777e7 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -894,12 +894,13 @@ void PianoRoll::drawNoteRect( QPainter & p, int x, int y,
 
 			int const distanceToBorder = 2;
 			int const xOffset = borderWidth + distanceToBorder;
+			int const yOffset = (noteHeight + noteTextHeight) / 2;
 
 			if (textSize.width() < noteWidth - xOffset)
 			{
 				p.setPen(noteTextColor);
 				p.setFont(noteFont);
-				QPoint textStart(x + xOffset, y + (noteTextHeight + (noteHeight - noteTextHeight) / 2));
+				QPoint textStart(x + xOffset, y + yOffset);
 
 				p.drawText(textStart, noteKeyString);
 			}