Index: /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 17360)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 17361)
@@ -276,5 +276,5 @@
                 v.setSize(maxWidth, 0);
                 int w = (int) Math.ceil(v.getPreferredSpan(View.X_AXIS));
-                int h = (int) Math.ceil(v.getPreferredSpan(View.Y_AXIS)) + 10;
+                int h = (int) Math.ceil(v.getPreferredSpan(View.Y_AXIS)) + 20; // see #18372 and #15550
                 pane.setPreferredSize(new Dimension(w, h));
             }