diff --git a/src/beast/app/beauti/ParametricDistributionInputEditor.java b/src/beast/app/beauti/ParametricDistributionInputEditor.java
index 9976d49cf..611a85aeb 100644
--- a/src/beast/app/beauti/ParametricDistributionInputEditor.java
+++ b/src/beast/app/beauti/ParametricDistributionInputEditor.java
@@ -119,7 +119,6 @@ public void paintComponent(java.awt.Graphics g) {
                 // ignore
             }
 
-            Font font = g.getFont();
             double minValue = 0.1;
             double maxValue = 1;
             try {
@@ -188,6 +187,7 @@ public void paintComponent(java.awt.Graphics g) {
             final int NR_OF_TICKS_Y = m_nTicks;
 
             // draw ticks on edge
+            Font font = g.getFont();
             Font smallFont = new Font(font.getName(), font.getStyle(), font.getSize() * 2/3);
             g.setFont(smallFont);
 
@@ -248,7 +248,8 @@ public void paintComponent(java.awt.Graphics g) {
                 g.drawString(ylabels[i], leftMargin - TICK_LENGTH - 1 - sfm.stringWidth(ylabels[i]), y + 3);
             }
 
-            g.setFont(new Font(font.getName(), font.getStyle(), font.getSize() * 10 / 12));
+            int fontHeight = font.getSize() * 10 / 12;
+            g.setFont(new Font(font.getName(), font.getStyle(), fontHeight));
             try {
                 FontMetrics fontMetrics = g.getFontMetrics();
                 String[] strs = new String[]{"2.5% Quantile", "5% Quantile", "Median", "95% Quantile", "97.5% Quantile"};
@@ -256,23 +257,23 @@ public void paintComponent(java.awt.Graphics g) {
             	mayBeUnstable = false;
                 for (k = 0; k < 5; k++) {
 
-                    int y = TOP_MARGIN + graphHeight + bottomMargin + g.getFontMetrics().getMaxAscent() + k * 10;
+                    int y = TOP_MARGIN + graphHeight + bottomMargin + g.getFontMetrics().getMaxAscent() + k * fontHeight;
 
                 	try {
                         g.drawString(format(m_distr.inverseCumulativeProbability(quantiles[k])), graphWidth / 2 + leftMargin, y);
                     } catch (MathException e) {
                         g.drawString("not available", graphWidth / 2 + leftMargin, y);
                     }
-                    g.drawString(strs[k], graphWidth / 2 - fontMetrics.stringWidth(strs[k]) + leftMargin - 10, y);
+                    g.drawString(strs[k], graphWidth / 2 - fontMetrics.stringWidth(strs[k]) + leftMargin - fontHeight, y);
                 }
                 if (mayBeUnstable) {
-                	int x = graphWidth * 3/ 4 + leftMargin; int y =TOP_MARGIN + graphHeight + bottomMargin + 10;
-                    g.drawString("* numbers", x, y + 20); 
-                    g.drawString("may not be", x, y + 30);                	
-                    g.drawString("accurate", x, y + 40);                	
+                	int x = graphWidth * 3/ 4 + leftMargin; int y =TOP_MARGIN + graphHeight + bottomMargin + fontHeight;
+                    g.drawString("* numbers", x, y + 2*fontHeight); 
+                    g.drawString("may not be", x, y + 3*fontHeight);                	
+                    g.drawString("accurate", x, y + 4*fontHeight);                	
                 }
                 try {
-                	g.drawString("mean " + format(m_distr.getMean()), graphWidth * 3/ 4 + leftMargin, TOP_MARGIN + graphHeight + bottomMargin + 10);
+                	g.drawString("mean " + format(m_distr.getMean()), graphWidth * 3/ 4 + leftMargin, TOP_MARGIN + graphHeight + bottomMargin + fontHeight);
                 } catch (RuntimeException e) {
                 	// catch in case it is not implemented.
                 }
diff --git a/src/beast/app/draw/EnumInputEditor.java b/src/beast/app/draw/EnumInputEditor.java
index 73869d3c9..965ddf371 100644
--- a/src/beast/app/draw/EnumInputEditor.java
+++ b/src/beast/app/draw/EnumInputEditor.java
@@ -1,5 +1,6 @@
 package beast.app.draw;
 
+import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,6 +49,9 @@ public void init(Input<?> input, BEASTInterface beastObject, int itemNr, ExpandO
         }
         if (availableValues.size() > 1) {
             m_selectPluginBox = new JComboBox<>(availableValues.toArray(new String[0]));
+            Dimension maxDim = m_selectPluginBox.getPreferredSize();
+            m_selectPluginBox.setMaximumSize(maxDim);
+
             String selectString = input.get().toString();
             m_selectPluginBox.setSelectedItem(selectString);