diff --git a/Source/Channels2A03.cpp b/Source/Channels2A03.cpp
index b9830f8..e6d14df 100644
--- a/Source/Channels2A03.cpp
+++ b/Source/Channels2A03.cpp
@@ -32,8 +32,7 @@
 //#define NOISE_PITCH_SCALE
 
 CChannelHandler2A03::CChannelHandler2A03() : 
-	CChannelHandler(0x7FF, 0x0F),
-	// // //
+	CChannelHandler(0x3FF, 0x0F),		// // //
 	m_bManualVolume(0),
 	m_iInitVolume(0),
 	// // //
diff --git a/Source/PatternEditor.cpp b/Source/PatternEditor.cpp
index 753d55e..476f75a 100644
--- a/Source/PatternEditor.cpp
+++ b/Source/PatternEditor.cpp
@@ -1248,6 +1248,8 @@ void CPatternEditor::DrawCell(CDC *pDC, int PosX, int Column, int Channel, bool
 	static const char NOTES_C[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
 	// Hex numbers
 	static const char HEX[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+	// // // Noise channel display
+	static const char NOISE[] = {'L', 'M', 'H', 'C'};
 
 	const bool m_bDisplayFlat = theApp.GetSettings()->General.bDisplayFlats;
 
@@ -1325,8 +1327,8 @@ void CPatternEditor::DrawCell(CDC *pDC, int PosX, int Column, int Channel, bool
 				default:
 					if (pTrackerChannel->GetID() == CHANID_NOISE) {
 						// Noise
-						char NoiseFreq = (pNoteData->Note - 1 + pNoteData->Octave * 12) & 0x0F;
-						DrawChar(pDC, PosX, PosY, HEX[NoiseFreq], pColorInfo->Note);
+						char NoiseFreq = (pNoteData->Note - 1 + pNoteData->Octave * 12) & 0x03;		// // //
+						DrawChar(pDC, PosX, PosY, NOISE[NoiseFreq], pColorInfo->Note);
 						DrawChar(pDC, PosX + CHAR_WIDTH, PosY, '-', pColorInfo->Note);
 						DrawChar(pDC, PosX + CHAR_WIDTH * 2, PosY, '#', pColorInfo->Note);
 					}