=== modified file 'src/com/goldencode/p2j/ui/client/gui/ComboBoxGuiImpl.java'
--- src/com/goldencode/p2j/ui/client/gui/ComboBoxGuiImpl.java	2016-05-02 13:05:43 +0000
+++ src/com/goldencode/p2j/ui/client/gui/ComboBoxGuiImpl.java	2016-05-02 13:34:04 +0000
@@ -1499,6 +1499,7 @@
       int yt = orig.y + 1 + (dim.height + fnt.pointSize)/2;
       gd.setFontStyle(fnt.style);
       // enabled state controls text drawing
+      int boxWidth = dim.width - DROP_DOWN_BUTTON_SIZE;
       if (isEnabled())
       {
          if (focused)
@@ -1509,14 +1510,14 @@
          {
             gd.setColor(gc.fgColor);
          }
-         gd.drawString(display, dim.width, dim.height, xt, yt, 0, 0);
+         gd.drawString(display, boxWidth, dim.height, xt, yt, 0, 0);
       }
       else
       {
          gd.setColor(lightShadow);
-         gd.drawString(display, dim.width, dim.height, xt + 1, yt + 1, 1, 1);
+         gd.drawString(display, boxWidth, dim.height, xt + 1, yt + 1, 1, 1);
          gd.setColor(darkShadow);
-         gd.drawString(display, dim.width, dim.height, xt, yt, 0, 0);
+         gd.drawString(display, boxWidth, dim.height, xt, yt, 0, 0);
       }
 
       // draw dotted rectangle around focused item text

=== modified file 'src/com/goldencode/p2j/ui/client/gui/ScrollableSelectionListGuiImpl.java'
--- src/com/goldencode/p2j/ui/client/gui/ScrollableSelectionListGuiImpl.java	2016-05-02 13:05:43 +0000
+++ src/com/goldencode/p2j/ui/client/gui/ScrollableSelectionListGuiImpl.java	2016-05-02 13:29:16 +0000
@@ -699,7 +699,8 @@
       }
 
       // draw item text
-      gd.drawString(getItemText(number), rw, rh,
+      gd.drawString(getItemText(number), rw - ((ComboBoxGuiImpl)box).getDropDownScrollBarWidth(),
+                    rh,
                     box != null && box.config().mode == ComboBoxConfig.Mode.SIMPLE
                        ? x + ComboBoxGuiImpl.ENTRY_SHIFT : x + ComboBoxGuiImpl.TEXT_SHIFT,
                     y + 1 + (rh + fontSize)/2, 0, 0);

=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.canvas_renderer.js'
--- src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.canvas_renderer.js	2016-05-02 13:05:43 +0000
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.canvas_renderer.js	2016-05-02 13:31:06 +0000
@@ -1810,7 +1810,7 @@
       textWidth = p2j.fonts.getTextWidth(cfont, text);
       if (boxWidth > 0)
       {
-         x = (boxWidth - textWidth - 16) / 2 + xOffset;
+         x = (boxWidth - textWidth) / 2 + xOffset;
       }
    }