Index: src/org/openstreetmap/josm/gui/layer/NoteLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 17329)
+++ src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(working copy)
@@ -233,7 +233,6 @@
             displayedPanel.setFont(UIManager.getFont("ToolTip.font"));
             displayedPanel.setBorder(BorderFactory.createLineBorder(Color.black));
             displayedPanel.enableClickableHyperlinks();
-            pTooltip = fixPanelSizeAndLocation(mv, text, xl, xr, yt, yb);
             displayedWindow = new JWindow(MainApplication.getMainFrame());
             displayedWindow.setAutoRequestFocus(false);
             displayedWindow.add(displayedPanel);
@@ -242,8 +241,8 @@
                     (MouseWheelEvent) SwingUtilities.convertMouseEvent(displayedWindow, e, mv)));
         } else {
             displayedPanel.setText(text);
-            pTooltip = fixPanelSizeAndLocation(mv, text, xl, xr, yt, yb);
         }
+        pTooltip = fixPanelSizeAndLocation(mv, text, xl, xr, yt, yb);
 
         displayedWindow.pack();
         displayedWindow.setLocation(pTooltip);