diff --git a/ChangeLog b/ChangeLog
index e9ed0f7d7..7e18c0815 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,9 @@ FIX
 * Audio Layers: Audio Clips were not generating use project-relative paths when 
   audio files were children of project root folder
 
+* Issue #523: Comments tab for instruments did not scroll correctly
+
+
 > Notes for 2.8.0 <
 [release 2020.06.03]
 
diff --git a/blue-ui-core/src/main/java/blue/ui/core/orchestra/InstrumentEditPanel.java b/blue-ui-core/src/main/java/blue/ui/core/orchestra/InstrumentEditPanel.java
index 8e1e613a8..888215ded 100644
--- a/blue-ui-core/src/main/java/blue/ui/core/orchestra/InstrumentEditPanel.java
+++ b/blue-ui-core/src/main/java/blue/ui/core/orchestra/InstrumentEditPanel.java
@@ -59,10 +59,7 @@ public InstrumentEditPanel() {
         JTabbedPane tabs = new JTabbedPane();
 
         tabs.add("Instrument Editor", editPanel);
-        tabs.add("Comments", new JScrollPane(commentPane));
-
-//        commentPane.getJEditorPane().setWrapStyleWord(true);
-//        commentPane.setLineWrap(true);
+        tabs.add("Comments", commentPane);
 
         editPanel.setLayout(cardLayout);