diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
index 33a014531..17690194a 100644
--- a/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
+++ b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
@@ -260,6 +260,7 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
 		figureHolder.add(scrollPane, BorderLayout.CENTER);
 		rotationSlider.setEnabled(true);
 		scaleSelector.setEnabled(true);
+		scrollPane.revalidate();
 		revalidate();
 		figureHolder.revalidate();
 		figure.repaint();
diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java b/swing/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java
index 3851771ff..3a16cf6e9 100644
--- a/swing/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java
+++ b/swing/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java
@@ -258,7 +258,7 @@ public class ScaleScrollPane extends JScrollPane
 	////////////////  The view port rulers  ////////////////
 	
 	
-	private class Ruler extends JComponent {
+	private class Ruler extends JComponent implements ChangeListener {
 		public static final int HORIZONTAL = 0;
 		public static final int VERTICAL = 1;
 		
@@ -266,26 +266,23 @@ public class ScaleScrollPane extends JScrollPane
 		
 		public Ruler(int orientation) {
 			this.orientation = orientation;
-			
-			rulerUnit.addChangeListener(new ChangeListener() {
-				@Override
-				public void stateChanged(ChangeEvent e) {
-				    updateSize();
-					Ruler.this.repaint();
-				}
-			});
+			rulerUnit.addChangeListener(this);
+		}
+		
+		@Override
+		public void stateChanged(ChangeEvent e) {
+			updateSize();
+			repaint();
 		}
 		
 		private void updateSize() {
 			if (orientation == HORIZONTAL) {
-			    Ruler.this.setMinimumSize(new Dimension(component.getWidth() + 10, RULER_SIZE));
-			    Ruler.this.setPreferredSize(new Dimension(component.getWidth() + 10, RULER_SIZE));
+			    setMinimumSize(new Dimension(component.getWidth() + 10, RULER_SIZE));
+			    setPreferredSize(new Dimension(component.getWidth() + 10, RULER_SIZE));
 			} else {
-			    Ruler.this.setMinimumSize(new Dimension(RULER_SIZE, component.getHeight() + 10));
-			    Ruler.this.setPreferredSize(new Dimension(RULER_SIZE, component.getHeight() + 10));
+			    setMinimumSize(new Dimension(RULER_SIZE, component.getHeight() + 10));
+			    setPreferredSize(new Dimension(RULER_SIZE, component.getHeight() + 10));
 			}
-			revalidate();
-			repaint();
 		}
 		
         private double fromPx(final int px) {