diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css
index 21a3b1551..55f82e4b3 100644
--- a/data/themes/classic/style.css
+++ b/data/themes/classic/style.css
@@ -127,7 +127,7 @@ PianoRoll {
 	qproperty-noteBorders: true; /* boolean property, set false to have borderless notes */
 	qproperty-selectedNoteColor: rgb( 0, 125, 255 );
 	qproperty-barColor: #4afd85;
-	qproperty-markedSemitoneColor: rgba( 40, 40, 40, 200 );
+	qproperty-markedSemitoneColor: rgba( 0, 255, 200, 60 );
 	/* Grid colors */
 	qproperty-lineColor: rgba( 128, 128, 128, 80 );
 	qproperty-beatLineColor: rgba( 128, 128, 128, 160 );
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index 314ca98c7..8493abbf3 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -146,7 +146,7 @@ PianoRoll {
 	qproperty-noteBorders: false; /* boolean property, set false to have borderless notes */
 	qproperty-selectedNoteColor: #064d79;
 	qproperty-barColor: #078f3a;
-	qproperty-markedSemitoneColor: #06170E;
+	qproperty-markedSemitoneColor: rgba(255, 255, 255, 30);
 	/* Grid colors */
 	qproperty-lineColor: #292929;
 	qproperty-beatLineColor: #2d6b45;
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 98c84a524..dbec84357 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -2633,23 +2633,6 @@ void PianoRoll::paintEvent(QPaintEvent * pe )
 
 	int key = m_startKey;
 
-	// display note marks before drawing other lines
-	for( int i = 0; i < m_markedSemiTones.size(); i++ )
-	{
-		const int key_num = m_markedSemiTones.at( i );
-		const int y = keyAreaBottom() + 5
-			- KEY_LINE_HEIGHT * ( key_num - m_startKey + 1 );
-
-		if( y > keyAreaBottom() )
-		{
-			break;
-		}
-
-		p.fillRect( WHITE_KEY_WIDTH + 1, y - KEY_LINE_HEIGHT / 2, width() - 10, KEY_LINE_HEIGHT,
-			    markedSemitoneColor() );
-	}
-
-
 	// draw all white keys...
 	for( int y = key_line_y + 1 + y_offset; y > PR_TOP_MARGIN;
 			key_line_y -= KEY_LINE_HEIGHT, ++keys_processed )
@@ -2913,7 +2896,6 @@ void PianoRoll::paintEvent(QPaintEvent * pe )
 			}
 		}
 
-
 		// Draw the vertical beat lines
 		int ticksPerBeat = DefaultTicksPerTact /
 			Engine::getSong()->getTimeSigModel().getDenominator();
@@ -2934,8 +2916,23 @@ void PianoRoll::paintEvent(QPaintEvent * pe )
 			p.setPen( barLineColor() );
 			p.drawLine( x, PR_TOP_MARGIN, x, height() - PR_BOTTOM_MARGIN );
 		}
-	}
 
+		// draw marked semitones after the grid
+		for( int i = 0; i < m_markedSemiTones.size(); i++ )
+		{
+			const int key_num = m_markedSemiTones.at( i );
+			const int y = keyAreaBottom() + 5
+				- KEY_LINE_HEIGHT * ( key_num - m_startKey + 1 );
+
+			if( y > keyAreaBottom() )
+			{
+				break;
+			}
+
+			p.fillRect( WHITE_KEY_WIDTH + 1, y - KEY_LINE_HEIGHT / 2, width() - 10, KEY_LINE_HEIGHT + 1,
+				    markedSemitoneColor() );
+		}
+	}
 
 	// following code draws all notes in visible area
 	// and the note editing stuff (volume, panning, etc)